X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=tos%2Flib%2Fnet%2FDeluge%2FDelugePageTransfer.h;h=b5eb166bb7209e65f6669b9bb69ee5091cba8698;hb=7538b51c5737223b679143838726911829823006;hp=44455b56a7382a81dd34f4ebe509734462a4735a;hpb=adf61e8eec900c43698cf53806bdd954f2d65538;p=tinyos-2.x.git

diff --git a/tos/lib/net/Deluge/DelugePageTransfer.h b/tos/lib/net/Deluge/DelugePageTransfer.h
index 44455b56..b5eb166b 100644
--- a/tos/lib/net/Deluge/DelugePageTransfer.h
+++ b/tos/lib/net/Deluge/DelugePageTransfer.h
@@ -53,10 +53,15 @@ typedef uint8_t page_num_t;
 typedef nx_uint8_t nx_page_num_t;
 
 enum {
-  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,
-  
+  DELUGET2_PKT_PAYLOAD_SIZE  = TOSH_DATA_LENGTH - sizeof(nx_object_id_t) - sizeof(nx_page_num_t) - sizeof(nx_uint8_t),
+  DELUGET2_BYTES_PER_PAGE    = 1024,
+  DELUGET2_PKTS_PER_PAGE     = ((DELUGET2_BYTES_PER_PAGE - 1) / DELUGET2_PKT_PAYLOAD_SIZE) + 1,
+  DELUGET2_PKT_BITVEC_SIZE   = (((DELUGET2_PKTS_PER_PAGE - 1) / 8) + 1),
+
+  DELUGE_PKT_PAYLOAD_SIZE           = 23,
+  DELUGE_PKTS_PER_PAGE              = 48,
+  DELUGE_BYTES_PER_PAGE             = (DELUGE_PKTS_PER_PAGE*DELUGE_PKT_PAYLOAD_SIZE),
+
   DELUGE_VERSION                    = 2,
   DELUGE_MAX_ADV_PERIOD_LOG2        = 22,
   DELUGE_NUM_NEWDATA_ADVS_REQUIRED  = 2,
@@ -70,7 +75,6 @@ enum {
   DELUGE_INVALID_ADDR               = (0x7fffffffL),
   DELUGE_MAX_REQ_DELAY              = (0x1L << (DELUGE_MIN_ADV_PERIOD_LOG2 - 1)),
   DELUGE_NACK_TIMEOUT               = (DELUGE_MAX_REQ_DELAY >> 0x1),
-  DELUGE_PKT_BITVEC_SIZE            = (((DELUGE_PKTS_PER_PAGE - 1) / 8) + 1),
   DELUGE_MAX_IMAGE_SIZE             = (128L * 1024L),
   DELUGE_MAX_PAGES                  = 128,
   DELUGE_CRC_SIZE                   = sizeof(uint16_t),