From: razvanm <razvanm>
Date: Tue, 28 Apr 2009 22:54:17 +0000 (+0000)
Subject: One more small change for Deluge T2 to allow it to properly deal with images bigger... 
X-Git-Tag: rc_6_tinyos_2_1_1~400
X-Git-Url: https://oss.titaniummirror.com/gitweb/?p=tinyos-2.x.git;a=commitdiff_plain;h=079699a3ec5419479cc3bad49814ca06da91d196

One more small change for Deluge T2 to allow it to properly deal with images bigger than 64K.
---

diff --git a/tos/lib/net/Deluge/Deluge.h b/tos/lib/net/Deluge/Deluge.h
index 26eeadb7..ec195201 100644
--- a/tos/lib/net/Deluge/Deluge.h
+++ b/tos/lib/net/Deluge/Deluge.h
@@ -65,7 +65,7 @@ typedef nx_struct DelugeCmd {
   nx_uint8_t type;
   nx_uint32_t uidhash;  // unique id of image
   nx_uint8_t  imgNum;   // image number
-  nx_uint16_t size;     // size of the image
+  nx_uint32_t size;     // size of the image
 } DelugeCmd;
 
 typedef struct BootArgs {
diff --git a/tos/lib/net/Deluge/DelugeP.nc b/tos/lib/net/Deluge/DelugeP.nc
index f2df208f..e5dc2efa 100644
--- a/tos/lib/net/Deluge/DelugeP.nc
+++ b/tos/lib/net/Deluge/DelugeP.nc
@@ -153,7 +153,7 @@ implementation
 
   event void DelugeMetadata.readDone(uint8_t imgNum, DelugeIdent* ident, error_t error)
   {
-//    printf("readDone 0x%lx imgNum: %d size: %u\n", lastCmd.uidhash, lastCmd.imgNum, lastCmd.size);
+//    printf("readDone 0x%lx imgNum: %d size: %lu\n", lastCmd.uidhash, lastCmd.imgNum, lastCmd.size);
     if (ident->uidhash == lastCmd.uidhash) {
       if (lastCmd.type == DELUGE_CMD_DISSEMINATE_AND_REPROGRAM) {
 	call NetProg.programImageAndReboot(call StorageMap.getPhysicalAddress[imgNum](0));