Add SharedSplitControlC, for N clients needing shared access to something.

[tinyos-2.x.git] / tos / chips / stm25p / Stm25pBlockP.nc

diff --git a/tos/chips/stm25p/Stm25pBlockP.nc b/tos/chips/stm25p/Stm25pBlockP.nc
index 1d06ecb00ba33091568df0c11840ba6961f3776f..7228c9743102b67b0f2e562efa0b254b4fa92295 100644 (file)
--- a/tos/chips/stm25p/Stm25pBlockP.nc
+++ b/tos/chips/stm25p/Stm25pBlockP.nc
@@ -55,10 +55,9 @@ implementation {
   typedef enum {
     S_IDLE,
     S_READ,
-    S_VERIFY,
     S_CRC,
     S_WRITE,
-    S_COMMIT,
+    S_SYNC,
     S_ERASE,
   } stm25p_block_req_t;
   
@@ -93,11 +92,6 @@ implementation {
     return newRequest( id );
   }
   
-  command error_t Read.verify[ uint8_t id ]() {
-    m_req.req = S_VERIFY;
-    return newRequest( id );
-  }
-  
   command error_t Read.computeCrc[ uint8_t id ]( storage_addr_t addr,
                                                 storage_len_t len,
                                                 uint16_t crc ) {
@@ -117,8 +111,8 @@ implementation {
     return newRequest( id );
   }
   
-  command error_t Write.commit[ uint8_t id ]() {
-    m_req.req = S_COMMIT;
+  command error_t Write.sync[ uint8_t id ]() {
+    m_req.req = S_SYNC;
     return newRequest( id );
   }
   
@@ -160,7 +154,7 @@ implementation {
     case S_ERASE:
       call Sector.erase[ id ]( 0, call Sector.getNumSectors[ id ]() );
       break;
-    case S_COMMIT: case S_VERIFY:
+    case S_SYNC:
       signalDone( id, 0, SUCCESS );
       break;
     case S_IDLE:
@@ -204,9 +198,6 @@ implementation {
                                  m_block_state[ id ].buf,
                                  m_block_state[ id ].len, error );  
       break;
-    case S_VERIFY:
-      signal Read.verifyDone[ id ]( error );
-      break;
     case S_CRC:
       signal Read.computeCrcDone[ id ]( m_block_state[ id ].addr, 
                                        m_block_state[ id ].len, crc, error );
@@ -216,8 +207,8 @@ implementation {
                                    m_block_state[ id ].buf,
                                    m_block_state[ id ].len, error );
       break;
-    case S_COMMIT:
-      signal Write.commitDone[ id ]( error );
+    case S_SYNC:
+      signal Write.syncDone[ id ]( error );
       break;
     case S_ERASE:
       signal Write.eraseDone[ id ]( error );
@@ -230,10 +221,9 @@ implementation {
   
   default event void Read.readDone[ uint8_t id ]( storage_addr_t addr, void* buf, storage_len_t len, error_t error ) {}
   default event void Read.computeCrcDone[ uint8_t id ]( storage_addr_t addr, storage_len_t len, uint16_t crc, error_t error ) {}
-  default event void Read.verifyDone[ uint8_t id ]( error_t error ) {}
   default event void Write.writeDone[ uint8_t id ]( storage_addr_t addr, void* buf, storage_len_t len, error_t error ) {}
   default event void Write.eraseDone[ uint8_t id ]( error_t error ) {}
-  default event void Write.commitDone[ uint8_t id ]( error_t error ) {}
+  default event void Write.syncDone[ uint8_t id ]( error_t error ) {}
   
   default command storage_addr_t Sector.getPhysicalAddress[ uint8_t id ]( storage_addr_t addr ) { return 0xffffffff; }
   default command uint8_t Sector.getNumSectors[ uint8_t id ]() { return 0; }
@@ -242,7 +232,7 @@ implementation {
   default command error_t Sector.erase[ uint8_t id ]( uint8_t sector, uint8_t num_sectors ) { return FAIL; }
   default command error_t Sector.computeCrc[ uint8_t id ]( uint16_t crc, storage_addr_t addr, storage_len_t len ) { return FAIL; }
   default async command error_t ClientResource.request[ uint8_t id ]() { return FAIL; }
-  default async command void ClientResource.release[ uint8_t id ]() {}
+  default async command error_t ClientResource.release[ uint8_t id ]() { return FAIL; }
   
 }