[Tinyos-2-commits] CVS: tinyos-2.x/support/sdk/c Makefile.am, 1.1.2.2, 1.1.2.3 message.c, 1.1.2.1, 1.1.2.2 message.h, 1.1.2.1, 1.1.2.2

Tue May 2 16:13:01 PDT 2006

Update of /cvsroot/tinyos/tinyos-2.x/support/sdk/c
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12761

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	Makefile.am message.c message.h 
Log Message:
fixes and a simple test program (prettylisten) for mig

Index: Makefile.am
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/support/sdk/c/Attic/Makefile.am,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** Makefile.am	2 May 2006 22:52:06 -0000	1.1.2.2
--- Makefile.am	2 May 2006 23:12:59 -0000	1.1.2.3
***************
*** 7,10 ****
--- 7,11 ----

  bin_PROGRAMS=sf sflisten sfsend seriallisten
+ noinst_PROGRAMS=prettylisten
  noinst_LIBRARIES=libmote.a

***************
*** 12,15 ****
--- 13,19 ----
  sf_LDADD = libmote.a

+ prettylisten_SOURCES = prettylisten.c
+ prettylisten_LDADD = libmote.a
+ 
  sflisten_SOURCES = sflisten.c
  sflisten_LDADD = libmote.a
***************
*** 28,32 ****

  serialpacket.c serialpacket.h: $(SERIAL_H)
! 	mig -o serialpacket.h --c-prefix=spacket c $(SERIAL_H) serial_packet

  serialprotocol.h: $(SERIAL_H)
--- 32,36 ----

  serialpacket.c serialpacket.h: $(SERIAL_H)
! 	mig -o serialpacket.h -c-prefix=spacket c $(SERIAL_H) serial_packet

  serialprotocol.h: $(SERIAL_H)

Index: message.c
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/support/sdk/c/Attic/message.c,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** message.c	2 May 2006 22:52:07 -0000	1.1.2.1
--- message.c	2 May 2006 23:12:59 -0000	1.1.2.2
***************
*** 16,23 ****
  struct tmsg {
    uint8_t *data;
!   int len;
  };

! tmsg_t *new_tmsg(void *packet, int len)
  {
    tmsg_t *x = malloc(sizeof(tmsg_t));
--- 16,23 ----
  struct tmsg {
    uint8_t *data;
!   size_t len;
  };

! tmsg_t *new_tmsg(void *packet, size_t len)
  {
    tmsg_t *x = malloc(sizeof(tmsg_t));
***************
*** 42,46 ****
  }

! int tmsg_length(tmsg_t *msg)
  {
    return msg->len;
--- 42,46 ----
  }

! size_t tmsg_length(tmsg_t *msg)
  {
    return msg->len;
***************
*** 68,72 ****
  }

! uint64_t tmsg_uread_le(tmsg_t *msg, size_t offset, size_t length)
  {
    uint64_t x = 0;
--- 68,72 ----
  }

! uint64_t tmsg_read_ule(tmsg_t *msg, size_t offset, size_t length)
  {
    uint64_t x = 0;
***************
*** 108,115 ****
  int64_t tmsg_read_le(tmsg_t *msg, size_t offset, size_t length)
  {
!   return u2s(tmsg_uread_le(msg, offset, length), length);
  }

! void tmsg_uwrite_le(tmsg_t *msg, size_t offset, size_t length, uint64_t x)
  {
    if (boundsp(msg, offset, length))
--- 108,115 ----
  int64_t tmsg_read_le(tmsg_t *msg, size_t offset, size_t length)
  {
!   return u2s(tmsg_read_ule(msg, offset, length), length);
  }

! void tmsg_write_ule(tmsg_t *msg, size_t offset, size_t length, uint64_t x)
  {
    if (boundsp(msg, offset, length))
***************
*** 154,161 ****
  void tmsg_write_le(tmsg_t *msg, size_t offset, size_t length, int64_t value)
  {
!   tmsg_uwrite_le(msg, offset, length, value);
  }

! uint64_t tmsg_uread_be(tmsg_t *msg, size_t offset, size_t length)
  {
    uint64_t x = 0;
--- 154,161 ----
  void tmsg_write_le(tmsg_t *msg, size_t offset, size_t length, int64_t value)
  {
!   tmsg_write_ule(msg, offset, length, value);
  }

! uint64_t tmsg_read_ube(tmsg_t *msg, size_t offset, size_t length)
  {
    uint64_t x = 0;
***************
*** 197,204 ****
  int64_t tmsg_read_be(tmsg_t *msg, size_t offset, size_t length)
  {
!   return u2s(tmsg_uread_be(msg, offset, length), length);
  }

! void tmsg_uwrite_be(tmsg_t *msg, size_t offset, size_t length, uint64_t x)
  {
    if (boundsp(msg, offset, length))
--- 197,204 ----
  int64_t tmsg_read_be(tmsg_t *msg, size_t offset, size_t length)
  {
!   return u2s(tmsg_read_ube(msg, offset, length), length);
  }

! void tmsg_write_ube(tmsg_t *msg, size_t offset, size_t length, uint64_t x)
  {
    if (boundsp(msg, offset, length))
***************
*** 246,250 ****
  void tmsg_write_be(tmsg_t *msg, size_t offset, size_t length, int64_t value)
  {
!   tmsg_uwrite_be(msg, offset, length, value);
  }

--- 246,250 ----
  void tmsg_write_be(tmsg_t *msg, size_t offset, size_t length, int64_t value)
  {
!   tmsg_write_ube(msg, offset, length, value);
  }

***************
*** 277,295 ****
  float tmsg_read_float_le(tmsg_t *msg, size_t offset)
  {
!   return u2f(tmsg_uread_le(msg, offset, 32));
  }

  void tmsg_write_float_le(tmsg_t *msg, size_t offset, float x)
  {
!   tmsg_uwrite_le(msg, offset, 32, f2u(x));
  }

  float tmsg_read_float_be(tmsg_t *msg, size_t offset)
  {
!   return u2f(tmsg_uread_be(msg, offset, 32));
  }

  void tmsg_write_float_be(tmsg_t *msg, size_t offset, float x)
  {
!   tmsg_uwrite_be(msg, offset, 32, f2u(x));
  }
--- 277,295 ----
  float tmsg_read_float_le(tmsg_t *msg, size_t offset)
  {
!   return u2f(tmsg_read_ule(msg, offset, 32));
  }

  void tmsg_write_float_le(tmsg_t *msg, size_t offset, float x)
  {
!   tmsg_write_ule(msg, offset, 32, f2u(x));
  }

  float tmsg_read_float_be(tmsg_t *msg, size_t offset)
  {
!   return u2f(tmsg_read_ube(msg, offset, 32));
  }

  void tmsg_write_float_be(tmsg_t *msg, size_t offset, float x)
  {
!   tmsg_write_ube(msg, offset, 32, f2u(x));
  }

Index: message.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/support/sdk/c/Attic/message.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** message.h	2 May 2006 22:52:07 -0000	1.1.2.1
--- message.h	2 May 2006 23:12:59 -0000	1.1.2.2
***************
*** 20,27 ****
  void tmsg_fail(void);

! tmsg_t *new_tmsg(void *packet, int len);
  void free_tmsg(tmsg_t *msg);
  void *tmsg_data(tmsg_t *msg);
! int tmsg_length(tmsg_t *msg);

  uint64_t tmsg_read_ule(tmsg_t *msg, size_t bit_offset, size_t bit_length);
--- 20,27 ----
  void tmsg_fail(void);

! tmsg_t *new_tmsg(void *packet, size_t len);
  void free_tmsg(tmsg_t *msg);
  void *tmsg_data(tmsg_t *msg);
! size_t tmsg_length(tmsg_t *msg);

  uint64_t tmsg_read_ule(tmsg_t *msg, size_t bit_offset, size_t bit_length);