[Tinyos-2-commits] CVS: tinyos-2.x/tos/lib/net/Deluge/extra NetProgC.nc, 1.2, 1.3 NetProgM.nc, 1.2, 1.3

[Razvan Musaloiu-E.]

Update of /cvsroot/tinyos/tinyos-2.x/tos/lib/net/Deluge/extra
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv7406/extra

Modified Files:
	NetProgC.nc NetProgM.nc 
Log Message:
This commit from Chieh-Jan (Mike) Liang fixes the following issues:
- DelugeStorage is no longer included when DELUGE flag is not defined.
- Fix a problem related to the way MicaZ storage driver allocates volumes in reverse order than the one defined in XML file. The symptom here is that --diss command will disseminate the wrong volume.
- Fix the problem of not changing local node ID properly. The problem was reported by Ryan Stinnett.
- After a page is received and written to flash, sync the flash (especially for AT45DB).


Index: NetProgC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/net/Deluge/extra/NetProgC.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** NetProgC.nc	2 Jun 2007 00:09:14 -0000	1.2
--- NetProgC.nc	27 Jun 2007 20:04:57 -0000	1.3
***************
*** 55,57 ****
--- 55,61 ----
    components LedsC;
    NetProgM.Leds -> LedsC;
+   
+   components CC2420ControlP, ActiveMessageAddressC;
+   NetProgM.CC2420Config -> CC2420ControlP;
+   NetProgM.setAmAddress -> ActiveMessageAddressC;
  }

Index: NetProgM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/net/Deluge/extra/NetProgM.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** NetProgM.nc	2 Jun 2007 00:09:14 -0000	1.2
--- NetProgM.nc	27 Jun 2007 20:04:57 -0000	1.3
***************
*** 43,46 ****
--- 43,48 ----
      interface DelugeMetadata;
      interface Leds;
+     interface CC2420Config;
+     async command void setAmAddress(am_addr_t a);
    }
  }
***************
*** 77,87 ****
      if (tosInfo.crc == computeTosInfoCrc(&tosInfo)) {
        // TOS_AM_GROUP is not a variable in T2
!       //      TOS_AM_GROUP = tosInfo.groupId;
!       atomic TOS_NODE_ID = tosInfo.addr;
      }
      else {
        writeTOSinfo();
      }
!  
      return SUCCESS;
    }
--- 79,96 ----
      if (tosInfo.crc == computeTosInfoCrc(&tosInfo)) {
        // TOS_AM_GROUP is not a variable in T2
!       //   TOS_AM_GROUP = tosInfo.groupId;
!       
!       // Updates local node ID
!       atomic {
!         TOS_NODE_ID = tosInfo.addr;
!         call setAmAddress(tosInfo.addr);
!       }
!       call CC2420Config.setShortAddr(tosInfo.addr);
!       call CC2420Config.sync();
      }
      else {
        writeTOSinfo();
      }
!     
      return SUCCESS;
    }
***************
*** 124,127 ****
--- 133,138 ----
    }
  
+   event void CC2420Config.syncDone(error_t error) {}
+ 
    default command storage_addr_t DelugeStorage.getPhysicalAddress[uint8_t img_num](storage_addr_t addr) { return 0xFFFFFFFF; }