[Tinyos-beta-commits] CVS: tinyos-1.x/beta/STM25P STM25P.nc, 1.1, 1.2 STM25PM.nc, 1.1, 1.2 BlockStorageM.nc, 1.1, 1.2

[Jonathan Hui]

Update of /cvsroot/tinyos/tinyos-1.x/beta/STM25P
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11521

Modified Files:
	STM25P.nc STM25PM.nc BlockStorageM.nc 
Log Message:
- Added support for writing to the status register.



Index: STM25P.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/STM25P/STM25P.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** STM25P.nc	20 Nov 2004 18:59:43 -0000	1.1
--- STM25P.nc	22 Nov 2004 05:15:32 -0000	1.2
***************
*** 28,41 ****
  interface STM25P {
    command result_t read(stm25p_addr_t addr, uint8_t* data, stm25p_addr_t len);
!   event   result_t readDone(result_t result);
  
    command result_t pageProgram(stm25p_addr_t addr, uint8_t* data, stm25p_addr_t len);
!   event   result_t pageProgramDone(result_t result);
  
    command result_t sectorErase(stm25p_addr_t addr);
!   event   result_t sectorEraseDone(result_t result);
  
    command result_t bulkErase();
!   event   result_t bulkEraseDone(result_t result);
  
    command stm25p_sig_t getSignature();
--- 28,44 ----
  interface STM25P {
    command result_t read(stm25p_addr_t addr, uint8_t* data, stm25p_addr_t len);
!   event result_t readDone(result_t result);
  
    command result_t pageProgram(stm25p_addr_t addr, uint8_t* data, stm25p_addr_t len);
!   event result_t pageProgramDone(result_t result);
  
    command result_t sectorErase(stm25p_addr_t addr);
!   event result_t sectorEraseDone(result_t result);
  
    command result_t bulkErase();
!   event result_t bulkEraseDone(result_t result);
! 
!   command result_t writeSR(uint8_t value);
!   event result_t writeSRDone(result_t result);
  
    command stm25p_sig_t getSignature();

Index: STM25PM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/STM25P/STM25PM.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** STM25PM.nc	20 Nov 2004 18:59:43 -0000	1.1
--- STM25PM.nc	22 Nov 2004 05:15:32 -0000	1.2
***************
*** 67,70 ****
--- 67,71 ----
      case STM25P_SE: return signal STM25P.sectorEraseDone(result);
      case STM25P_BE: return signal STM25P.bulkEraseDone(result);
+     case STM25P_WRSR: return signal STM25P.writeSRDone(result);
      }
      return SUCCESS;
***************
*** 161,165 ****
      
      // enable writes if needed
!     if (curCmd == STM25P_PP || curCmd == STM25P_SE || curCmd == STM25P_BE)
        sendCmd(STM25P_WREN, 0, NULL, 0);
      
--- 162,167 ----
      
      // enable writes if needed
!     if (curCmd == STM25P_WRSR || curCmd == STM25P_PP 
! 	|| curCmd == STM25P_SE || curCmd == STM25P_BE)
        sendCmd(STM25P_WREN, 0, NULL, 0);
      
***************
*** 170,174 ****
  
      // setup check for write done
!     if (curCmd == STM25P_PP || curCmd == STM25P_SE || curCmd == STM25P_BE)
        post checkWriteDone();
      else
--- 172,177 ----
  
      // setup check for write done
!     if (curCmd == STM25P_WRSR || curCmd == STM25P_PP 
! 	|| curCmd == STM25P_SE || curCmd == STM25P_BE)
        post checkWriteDone();
      else
***************
*** 195,198 ****
--- 198,205 ----
    }
  
+   command result_t STM25P.writeSR(uint8_t value) {
+     return newRequest(STM25P_WRSR, 0, &value, 1);
+   }
+ 
    command stm25p_sig_t STM25P.getSignature() { 
      return signature; 

Index: BlockStorageM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/STM25P/BlockStorageM.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** BlockStorageM.nc	20 Nov 2004 18:59:42 -0000	1.1
--- BlockStorageM.nc	22 Nov 2004 05:15:32 -0000	1.2
***************
*** 243,246 ****
--- 243,250 ----
    }
  
+   event result_t STM25P.writeSRDone(result_t result) {
+     return SUCCESS;
+   }
+ 
    default event result_t BlockWrite.writeDone[uint8_t id](result_t result) { return SUCCESS; }
    default event result_t BlockWrite.eraseDone[uint8_t id](result_t result) { return SUCCESS; }