[Tinyos-commits] CVS: tinyos-1.x/tos/platform/pc HPLSTM25PC.nc, 1.1, 1.2

[Jonathan Hui]

Update of /cvsroot/tinyos/tinyos-1.x/tos/platform/pc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7722

Modified Files:
	HPLSTM25PC.nc 
Log Message:
- Sync with new interface.



Index: HPLSTM25PC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tos/platform/pc/HPLSTM25PC.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** HPLSTM25PC.nc	12 Jul 2005 03:03:28 -0000	1.1
--- HPLSTM25PC.nc	16 Jul 2005 00:20:37 -0000	1.2
***************
*** 81,87 ****
    async command result_t HPLSTM25P.getBus() { return SUCCESS;  }
    async command result_t HPLSTM25P.releaseBus() { return SUCCESS; }
!   async command result_t HPLSTM25P.beginCmd() { return SUCCESS; }
  
!   async command result_t HPLSTM25P.endCmd() {
  
      if ( state == STM25P_WRSR || state == STM25P_PP
--- 81,87 ----
    async command result_t HPLSTM25P.getBus() { return SUCCESS;  }
    async command result_t HPLSTM25P.releaseBus() { return SUCCESS; }
!   async command void HPLSTM25P.beginCmd() {}
  
!   async command void HPLSTM25P.endCmd() {
  
      if ( state == STM25P_WRSR || state == STM25P_PP
***************
*** 95,106 ****
      curAddr = 0;
  
-     return SUCCESS;
- 
    }
  
!   async command result_t HPLSTM25P.hold() { return SUCCESS; }
!   async command result_t HPLSTM25P.unhold() { return SUCCESS; }
  
!   async command result_t HPLSTM25P.txBuf(void* buf, stm25p_addr_t len) {
  
      uint8_t* bufByte = (uint8_t*)buf;
--- 95,104 ----
      curAddr = 0;
  
    }
  
!   async command void HPLSTM25P.hold() {}
!   async command void HPLSTM25P.unhold() {}
  
!   async command void HPLSTM25P.txBuf(void* buf, stm25p_addr_t len) {
  
      uint8_t* bufByte = (uint8_t*)buf;
***************
*** 165,175 ****
      }
  
-     return SUCCESS;
- 
    }
  
!   async command result_t HPLSTM25P.rxBuf(void* buf, stm25p_addr_t len, uint16_t* crcResult) {
  
-     uint16_t crc = *crcResult;
      uint8_t* bufByte = (uint8_t*)buf;
      uint8_t tmp;
--- 163,170 ----
      }
  
    }
  
!   async command uint16_t HPLSTM25P.rxBuf(void* buf, stm25p_addr_t len, uint16_t crc) {
  
      uint8_t* bufByte = (uint8_t*)buf;
      uint8_t tmp;
***************
*** 196,202 ****
      }
  
!     *crcResult = crc;
! 
!     return SUCCESS;
  
    }
--- 191,195 ----
      }
  
!     return crc;
  
    }