[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/pxa27x/p30 P30BlockP.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-serv16073

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	P30BlockP.nc 
Log Message:
Updated P30 storage components to current interface

Index: P30BlockP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/pxa27x/p30/Attic/P30BlockP.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
*** P30BlockP.nc	26 Jul 2006 01:40:10 -0000	1.1.2.1
--- P30BlockP.nc	18 Oct 2006 19:33:23 -0000	1.1.2.2
***************
*** 51,56 ****
      S_ERASE,
      S_CRC,
!     S_COMMIT,
!     S_VERIFY,
    } p30_block_state_t;
    norace p30_block_state_t m_state = S_IDLE;
--- 51,56 ----
      S_ERASE,
      S_CRC,
!     S_SYNC,
! 
    } p30_block_state_t;
    norace p30_block_state_t m_state = S_IDLE;
***************
*** 76,82 ****
        signal Write.writeDone[clientId](clientAddr, clientBuf, clientLen, clientResult);
        break;
!    case S_COMMIT:
        m_state = S_IDLE;
!       signal Write.commitDone[clientId](SUCCESS);
        break;
      case S_ERASE:
--- 76,82 ----
        signal Write.writeDone[clientId](clientAddr, clientBuf, clientLen, clientResult);
        break;
!    case S_SYNC:
        m_state = S_IDLE;
!       signal Write.syncDone[clientId](SUCCESS);
        break;
      case S_ERASE:
***************
*** 88,95 ****
        signal Read.readDone[clientId](clientAddr, clientBuf, clientLen, clientResult);
        break;
-    case S_VERIFY:
-       m_state = S_IDLE;
-       signal Read.verifyDone[clientId](SUCCESS);
-       break;
      default:
        break;
--- 88,91 ----
***************
*** 129,138 ****
    
    /*
!    * Commit doesn't really do anything because Intel PXA is
     * write-through.
     */
!   command error_t Write.commit[ storage_volume_t b ]() {
  
!     m_state = S_COMMIT;
      clientId = b;
  
--- 125,134 ----
    
    /*
!    * Sync doesn't really do anything because Intel PXA is
     * write-through.
     */
!   command error_t Write.sync[ storage_volume_t b ]() {
  
!     m_state = S_SYNC;
      clientId = b;
  
***************
*** 195,206 ****
    }
    
-   command error_t Read.verify[ storage_volume_t b ]() {
- 
-     m_state = S_VERIFY;
-     clientId = b;
- 
-     post signalDoneTask();
-     return SUCCESS;
-   }
    
    command error_t Read.computeCrc[ storage_volume_t b ]( storage_addr_t addr,
--- 191,194 ----
***************
*** 220,227 ****
    default event void Write.writeDone[ storage_volume_t b ]( storage_addr_t addr, void* buf, storage_len_t len, error_t error ) {}
    default event void Write.eraseDone[ storage_volume_t b ]( error_t error ) {}
!   default event void Write.commitDone[ storage_volume_t b ]( error_t error ) {}
  
    default event void Read.readDone[ storage_volume_t b ]( storage_addr_t addr, void* buf, storage_len_t len, error_t error ) {}
    default event void Read.computeCrcDone[ storage_volume_t b ]( storage_addr_t addr, storage_len_t len, uint16_t crc, error_t error ) {}
!   default event void Read.verifyDone[ storage_volume_t b ]( error_t error ) {}
  }
--- 208,215 ----
    default event void Write.writeDone[ storage_volume_t b ]( storage_addr_t addr, void* buf, storage_len_t len, error_t error ) {}
    default event void Write.eraseDone[ storage_volume_t b ]( error_t error ) {}
!   default event void Write.syncDone[ storage_volume_t b ]( error_t error ) {}
  
    default event void Read.readDone[ storage_volume_t b ]( storage_addr_t addr, void* buf, storage_len_t len, error_t error ) {}
    default event void Read.computeCrcDone[ storage_volume_t b ]( storage_addr_t addr, storage_len_t len, uint16_t crc, error_t error ) {}
! 
  }