[Tinyos-2-commits] CVS: tinyos-2.x/tos/lib/net/Deluge Deluge.h, 1.6, 1.7 DelugeP.nc, 1.7, 1.8

[Razvan Musaloiu-E.]

Update of /cvsroot/tinyos/tinyos-2.x/tos/lib/net/Deluge
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv26227/tos/lib/net/Deluge

Modified Files:
	Deluge.h DelugeP.nc 
Log Message:
One more small change for Deluge T2 to allow it to properly deal with images bigger than 64K.


Index: Deluge.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/net/Deluge/Deluge.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Deluge.h	20 Jun 2008 18:50:15 -0000	1.6
--- Deluge.h	28 Apr 2009 22:54:17 -0000	1.7
***************
*** 66,70 ****
    nx_uint32_t uidhash;  // unique id of image
    nx_uint8_t  imgNum;   // image number
!   nx_uint16_t size;     // size of the image
  } DelugeCmd;
  
--- 66,70 ----
    nx_uint32_t uidhash;  // unique id of image
    nx_uint8_t  imgNum;   // image number
!   nx_uint32_t size;     // size of the image
  } DelugeCmd;
  

Index: DelugeP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/net/Deluge/DelugeP.nc,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** DelugeP.nc	14 Jan 2008 04:22:01 -0000	1.7
--- DelugeP.nc	28 Apr 2009 22:54:17 -0000	1.8
***************
*** 154,158 ****
    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);
      if (ident->uidhash == lastCmd.uidhash) {
        if (lastCmd.type == DELUGE_CMD_DISSEMINATE_AND_REPROGRAM) {
--- 154,158 ----
    event void DelugeMetadata.readDone(uint8_t imgNum, DelugeIdent* ident, error_t error)
    {
! //    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) {