Some cleanup.

diff --git a/tos/lib/net/Deluge/DelugeMsgs.h b/tos/lib/net/Deluge/DelugeMsgs.h
index 2da6fdd876cb7c1184329d8be67e788174acba11..82b0b91e70e0db4d6c5cc2a6c13f39e64862ef5f 100644 (file)
--- a/tos/lib/net/Deluge/DelugeMsgs.h
+++ b/tos/lib/net/Deluge/DelugeMsgs.h
@@ -45,7 +45,6 @@ typedef nx_struct DelugeAdvMsg {
   nx_uint16_t       sourceAddr;
   nx_uint8_t        version;    // Deluge Version
   nx_uint8_t        type;
-  //DelugeNodeDesc nodeDesc;
   DelugeObjDesc  objDesc;
   nx_uint8_t        reserved;
 } DelugeAdvMsg;

diff --git a/tos/lib/net/Deluge/DelugePageTransfer.h b/tos/lib/net/Deluge/DelugePageTransfer.h
index cc914528bd8dd79875fa26996d321ca094e408a4..6654f732101060ed35e27e6d2d16aaf8c6a560bb 100644 (file)
--- a/tos/lib/net/Deluge/DelugePageTransfer.h
+++ b/tos/lib/net/Deluge/DelugePageTransfer.h
@@ -32,6 +32,7 @@
 #define DELUGEPAGETRANSFER_H
 
 #include "extra/telosb/TOSBoot_platform.h"
+#include <message.h>
 
 #define AM_DELUGEADVMSG  161
 #define AM_DELUGEREQMSG  162
@@ -45,9 +46,6 @@ typedef uint8_t page_num_t;
 typedef nx_uint8_t nx_page_num_t;
 
 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,
   DELUGE_PKTS_PER_PAGE     = ((DELUGE_BYTES_PER_PAGE - 1) / DELUGE_PKT_PAYLOAD_SIZE) + 1,
@@ -74,8 +72,6 @@ enum {
   DELUGE_INVALID_OBJID              = 0xff,
   DELUGE_INVALID_PKTNUM             = 0xff,
   DELUGE_INVALID_PGNUM              = 0xff,
-  
-  // From "DelugeMetadata.h"
 };
 
 typedef struct DelugeAdvTimer {