[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/stm25p Stm25pBlockP.nc, 1.1.2.10, 1.1.2.11

[Jonathan Hui]

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

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	Stm25pBlockP.nc 
Log Message:

Implement new BlockStorage interfaces.



Index: Stm25pBlockP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/stm25p/Stm25pBlockP.nc,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -C2 -d -r1.1.2.10 -r1.1.2.11
*** Stm25pBlockP.nc	15 Aug 2006 11:59:08 -0000	1.1.2.10
--- Stm25pBlockP.nc	21 Sep 2006 23:21:09 -0000	1.1.2.11
***************
*** 56,63 ****
      S_IDLE,
      S_READ,
-     S_VERIFY,
      S_CRC,
      S_WRITE,
!     S_COMMIT,
      S_ERASE,
    } stm25p_block_req_t;
--- 56,62 ----
      S_IDLE,
      S_READ,
      S_CRC,
      S_WRITE,
!     S_SYNC,
      S_ERASE,
    } stm25p_block_req_t;
***************
*** 94,102 ****
    }
    
-   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,
--- 93,96 ----
***************
*** 118,123 ****
    }
    
!   command error_t Write.commit[ uint8_t id ]() {
!     m_req.req = S_COMMIT;
      return newRequest( id );
    }
--- 112,117 ----
    }
    
!   command error_t Write.sync[ uint8_t id ]() {
!     m_req.req = S_SYNC;
      return newRequest( id );
    }
***************
*** 161,165 ****
        call Sector.erase[ id ]( 0, call Sector.getNumSectors[ id ]() );
        break;
!     case S_COMMIT: case S_VERIFY:
        signalDone( id, 0, SUCCESS );
        break;
--- 155,159 ----
        call Sector.erase[ id ]( 0, call Sector.getNumSectors[ id ]() );
        break;
!     case S_SYNC:
        signalDone( id, 0, SUCCESS );
        break;
***************
*** 205,211 ****
  				  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, 
--- 199,202 ----
***************
*** 217,222 ****
  				    m_block_state[ id ].len, error );
        break;
!     case S_COMMIT:
!       signal Write.commitDone[ id ]( error );
        break;
      case S_ERASE:
--- 208,213 ----
  				    m_block_state[ id ].len, error );
        break;
!     case S_SYNC:
!       signal Write.syncDone[ id ]( error );
        break;
      case S_ERASE:
***************
*** 231,238 ****
    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 command storage_addr_t Sector.getPhysicalAddress[ uint8_t id ]( storage_addr_t addr ) { return 0xffffffff; }
--- 222,228 ----
    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 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.syncDone[ uint8_t id ]( error_t error ) {}
    
    default command storage_addr_t Sector.getPhysicalAddress[ uint8_t id ]( storage_addr_t addr ) { return 0xffffffff; }