[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/pxa27x/p30 P30LogP.nc, 1.1.2.1, 1.1.2.2

[Philip Buonadonna]

Update of /cvsroot/tinyos/tinyos-2.x/tos/chips/pxa27x/p30
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv15347/p30

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	P30LogP.nc 
Log Message:
Updated to support current Log storage interfaces

Index: P30LogP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/pxa27x/p30/Attic/P30LogP.nc,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** P30LogP.nc	26 Jul 2006 01:40:10 -0000	1.1.2.1
--- P30LogP.nc	19 Oct 2006 00:47:29 -0000	1.1.2.2
***************
*** 102,105 ****
--- 102,106 ----
    uint32_t nextFreeRecord[NUM_VOLS]; // 0-X depending on data size
    storage_cookie_t readCookieOffset[NUM_VOLS]; // this is a raw offset
+   bool gbOverwriteOccured = FALSE;
  
    /* This shuffles all the blocks when we run out of space. We have to
***************
*** 135,138 ****
--- 136,140 ----
        lastBlock[block] = firstBlock[block];
        firstBlock[block] = pageCounter;
+       gbOverwriteOccured = TRUE;
      }
    }
***************
*** 268,272 ****
      case S_APPEND:
        m_state = S_IDLE;
!       signal Write.appendDone[clientId](clientBuf, clientLen, clientResult);
        break;
      case S_SYNC:
--- 270,275 ----
      case S_APPEND:
        m_state = S_IDLE;
!       signal Write.appendDone[clientId](clientBuf, clientLen, gbOverwriteOccured, clientResult);
!       gbOverwriteOccured = FALSE;
        break;
      case S_SYNC:
***************
*** 573,577 ****
    default event void Read.readDone[ storage_volume_t block ](void* buf, storage_len_t len, error_t error) {}
    default event void Read.seekDone[ storage_volume_t block ](error_t error) {}
!   default event void Write.appendDone[ storage_volume_t block ](void* buf, storage_len_t len, error_t error) {}
  
    default event void Write.eraseDone[ storage_volume_t block ](error_t error) {}
--- 576,580 ----
    default event void Read.readDone[ storage_volume_t block ](void* buf, storage_len_t len, error_t error) {}
    default event void Read.seekDone[ storage_volume_t block ](error_t error) {}
!   default event void Write.appendDone[ storage_volume_t block ](void* buf, storage_len_t len, bool recordsLost, error_t error) {}
  
    default event void Write.eraseDone[ storage_volume_t block ](error_t error) {}