[Tinyos-2-commits] CVS: tinyos-2.x/tos/lib/net/Deluge DelugeMsgs.h, 1.1, 1.2 DelugePageTransfer.h, 1.1, 1.2

[Razvan Musaloiu-E.]

Update of /cvsroot/tinyos/tinyos-2.x/tos/lib/net/Deluge
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv21348

Modified Files:
	DelugeMsgs.h DelugePageTransfer.h 
Log Message:
Some cleanup.


Index: DelugeMsgs.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/net/Deluge/DelugeMsgs.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DelugeMsgs.h	22 May 2007 20:34:22 -0000	1.1
--- DelugeMsgs.h	25 May 2007 17:26:12 -0000	1.2
***************
*** 46,50 ****
    nx_uint8_t        version;    // Deluge Version
    nx_uint8_t        type;
-   //DelugeNodeDesc nodeDesc;
    DelugeObjDesc  objDesc;
    nx_uint8_t        reserved;
--- 46,49 ----

Index: DelugePageTransfer.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/net/Deluge/DelugePageTransfer.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DelugePageTransfer.h	22 May 2007 20:34:23 -0000	1.1
--- DelugePageTransfer.h	25 May 2007 17:26:12 -0000	1.2
***************
*** 33,36 ****
--- 33,37 ----
  
  #include "extra/telosb/TOSBoot_platform.h"
+ #include <message.h>
  
  #define AM_DELUGEADVMSG  161
***************
*** 46,52 ****
  
  enum {
- //  DELUGE_PKTS_PER_PAGE    = 48,
- //  DELUGE_PKT_PAYLOAD_SIZE = 23,
- //  DELUGE_BYTES_PER_PAGE   = (DELUGE_PKTS_PER_PAGE * DELUGE_PKT_PAYLOAD_SIZE),
    DELUGE_PKT_PAYLOAD_SIZE  = TOSH_DATA_LENGTH - sizeof(nx_object_id_t) - sizeof(nx_page_num_t) - sizeof(nx_uint8_t),
    DELUGE_BYTES_PER_PAGE    = 1024,
--- 47,50 ----
***************
*** 75,80 ****
    DELUGE_INVALID_PKTNUM             = 0xff,
    DELUGE_INVALID_PGNUM              = 0xff,
-   
-   // From "DelugeMetadata.h"
  };
  
--- 73,76 ----