[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/harvard/spaulding/src/dataStore DataStoreSDM.nc, 1.2, 1.3

[Konrad Lorincz]

Update of /cvsroot/tinyos/tinyos-1.x/contrib/harvard/spaulding/src/dataStore
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv12126/src/dataStore

Modified Files:
	DataStoreSDM.nc 
Log Message:
Added nodeID on flash

Index: DataStoreSDM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/harvard/spaulding/src/dataStore/DataStoreSDM.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DataStoreSDM.nc	12 Dec 2007 20:44:08 -0000	1.2
--- DataStoreSDM.nc	21 Dec 2007 04:40:02 -0000	1.3
***************
*** 59,66 ****
      typedef struct FlashInfo {
          uint32_t flashInfoHash;
          blocksqnnbr_t tailBlockSqnNbr;
          blocksqnnbr_t headBlockSqnNbr;
      } FlashInfo;
!     uint32_t flashInfoHash = 135792468;
      enum {FLASH_INFO_WRITE_PERIOD = 1500};  // write flashInfo to flash every X blocks (6 chans @100Hz ~= every 5 mins)
  
--- 59,67 ----
      typedef struct FlashInfo {
          uint32_t flashInfoHash;
+         uint32_t nodeID;
          blocksqnnbr_t tailBlockSqnNbr;
          blocksqnnbr_t headBlockSqnNbr;
      } FlashInfo;
!     uint32_t flashInfoHash = 135792100;
      enum {FLASH_INFO_WRITE_PERIOD = 1500};  // write flashInfo to flash every X blocks (6 chans @100Hz ~= every 5 mins)
  
***************
*** 77,81 ****
              if (currFlashInfo.flashInfoHash == flashInfoHash) {
                  // we have a valid entry
!                 atomic {
                      tailBlockSqnNbr = currFlashInfo.tailBlockSqnNbr;
                      headBlockSqnNbr = currFlashInfo.headBlockSqnNbr;    
--- 78,82 ----
              if (currFlashInfo.flashInfoHash == flashInfoHash) {
                  // we have a valid entry
!                 atomic {                    
                      tailBlockSqnNbr = currFlashInfo.tailBlockSqnNbr;
                      headBlockSqnNbr = currFlashInfo.headBlockSqnNbr;    
***************
*** 91,94 ****
--- 92,96 ----
          atomic {
              currFlashInfo.flashInfoHash = flashInfoHash;
+             currFlashInfo.nodeID = TOS_LOCAL_ADDRESS;
              currFlashInfo.tailBlockSqnNbr = tailBlockSqnNbr;
              currFlashInfo.headBlockSqnNbr = headBlockSqnNbr;