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

[Konrad Lorincz]

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

Modified Files:
	DataStoreSDC.nc DataStoreSDM.nc 
Log Message:
removed DATASTORE_REMEMBER_BLOCKS_ON_FLASH double definition

Index: DataStoreSDC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/harvard/spaulding/src/dataStore/DataStoreSDC.nc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** DataStoreSDC.nc	22 Aug 2007 00:43:53 -0000	1.1.1.1
--- DataStoreSDC.nc	24 Jul 2008 19:50:04 -0000	1.2
***************
*** 40,43 ****
--- 40,44 ----
  
  #define DATASTORESD_SPLITPHASE
+ #define DATASTORE_REMEMBER_BLOCKS_ON_FLASH
  
  configuration DataStoreSDC 

Index: DataStoreSDM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/harvard/spaulding/src/dataStore/DataStoreSDM.nc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** DataStoreSDM.nc	6 Feb 2008 20:48:50 -0000	1.4
--- DataStoreSDM.nc	24 Jul 2008 19:50:04 -0000	1.5
***************
*** 37,41 ****
  #include "PrintfUART.h"
  
! #define REMEMBER_BLOCKS_ON_FLASH
  
  module DataStoreSDM 
--- 37,41 ----
  #include "PrintfUART.h"
  
! 
  
  module DataStoreSDM 
***************
*** 56,60 ****
      uint8_t sdBuff[512];
     
! #ifdef REMEMBER_BLOCKS_ON_FLASH
      typedef struct FlashInfo {
          uint32_t flashInfoHash;
--- 56,60 ----
      uint8_t sdBuff[512];
     
! #ifdef DATASTORE_REMEMBER_BLOCKS_ON_FLASH
      typedef struct FlashInfo {
          uint32_t flashInfoHash;
***************
*** 68,72 ****
  #endif
      // ========================= Methods =========================    
! #ifdef REMEMBER_BLOCKS_ON_FLASH
      void readFlashInfo()
      {
--- 68,72 ----
  #endif
      // ========================= Methods =========================    
! #ifdef DATASTORE_REMEMBER_BLOCKS_ON_FLASH
      void readFlashInfo()
      {
***************
*** 133,137 ****
      command result_t StdControl.start()
      {
! #ifdef REMEMBER_BLOCKS_ON_FLASH
          readFlashInfo();
  #endif
--- 133,137 ----
      command result_t StdControl.start()
      {
! #ifdef DATASTORE_REMEMBER_BLOCKS_ON_FLASH
          readFlashInfo();
  #endif
***************
*** 198,202 ****
                  if (call SD.writeBlock(blockPtr->sqnNbr*512, 512, (uint8_t*)blockPtr/*sdBuff*/) == 0) { // NOTE: 0 means SUCCESS!!!
                      atomic headBlockSqnNbr++;
! #ifdef REMEMBER_BLOCKS_ON_FLASH
                      if (headBlockSqnNbr % FLASH_INFO_WRITE_PERIOD == 0)
                          writeFlashInfo();
--- 198,202 ----
                  if (call SD.writeBlock(blockPtr->sqnNbr*512, 512, (uint8_t*)blockPtr/*sdBuff*/) == 0) { // NOTE: 0 means SUCCESS!!!
                      atomic headBlockSqnNbr++;
! #ifdef DATASTORE_REMEMBER_BLOCKS_ON_FLASH
                      if (headBlockSqnNbr % FLASH_INFO_WRITE_PERIOD == 0)
                          writeFlashInfo();
***************
*** 253,257 ****
              atomic headBlockSqnNbr++;
              signal DataStore.addDone(blockPtr, blockPtr->sqnNbr, SUCCESS);
! #ifdef REMEMBER_BLOCKS_ON_FLASH
              if (headBlockSqnNbr % FLASH_INFO_WRITE_PERIOD == 0)
                  writeFlashInfo();
--- 253,257 ----
              atomic headBlockSqnNbr++;
              signal DataStore.addDone(blockPtr, blockPtr->sqnNbr, SUCCESS);
! #ifdef DATASTORE_REMEMBER_BLOCKS_ON_FLASH
              if (headBlockSqnNbr % FLASH_INFO_WRITE_PERIOD == 0)
                  writeFlashInfo();