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

diff --git a/tos/lib/net/Deluge/Deluge.h b/tos/lib/net/Deluge/Deluge.h
index 26eeadb70ac7918498b7dc9d1fffebbc3284eedd..ec1952010c6bf66cd7a164e54c4a9086ada70a62 100644 (file)
--- 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 f2df208fe73cafde10b1cdfe5ae0850454d66864..e5dc2efa62722082bf6d277096b649c26e086ec8 100644 (file)
--- 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));