[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/pxa27x/i2c HalPXA27xI2CMasterP.nc, 1.1.2.5, 1.1.2.6

[Philip Buonadonna]

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

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	HalPXA27xI2CMasterP.nc 
Log Message:
Fixed WriteError handler bug.

Index: HalPXA27xI2CMasterP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/pxa27x/i2c/HalPXA27xI2CMasterP.nc,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -C2 -d -r1.1.2.5 -r1.1.2.6
*** HalPXA27xI2CMasterP.nc	14 Jul 2006 16:27:05 -0000	1.1.2.5
--- HalPXA27xI2CMasterP.nc	5 Sep 2006 18:29:57 -0000	1.1.2.6
***************
*** 162,167 ****
      call I2C.setICR(ICR_UR);
      call I2C.setICR(mBaseICRFlags);
-     mI2CState = I2C_STATE_IDLE;
      atomic {
        signal I2CPacket.readDone(FAIL,mCurTargetAddr,mCurBufLen,mCurBuf);
      }
--- 162,167 ----
      call I2C.setICR(ICR_UR);
      call I2C.setICR(mBaseICRFlags);
      atomic {
+       mI2CState = I2C_STATE_IDLE;
        signal I2CPacket.readDone(FAIL,mCurTargetAddr,mCurBufLen,mCurBuf);
      }
***************
*** 174,180 ****
      call I2C.setICR(ICR_UR);
      call I2C.setICR(mBaseICRFlags);
-     mI2CState = I2C_STATE_IDLE;
      atomic {
!       signal I2CPacket.readDone(FAIL,mCurTargetAddr,mCurBufLen,mCurBuf);
      }
      return;
--- 174,180 ----
      call I2C.setICR(ICR_UR);
      call I2C.setICR(mBaseICRFlags);
      atomic {
!       mI2CState = I2C_STATE_IDLE;
!       signal I2CPacket.writeDone(FAIL,mCurTargetAddr,mCurBufLen,mCurBuf);
      }
      return;
***************
*** 199,203 ****
    async command error_t I2CPacket.read(i2c_flags_t flags, uint16_t addr, uint8_t length, uint8_t* data) {
      error_t error = SUCCESS;
-     uint8_t tmpAddr;
  
      if ((flags & I2C_ACK_END) && (flags & I2C_STOP)) {
--- 199,202 ----
***************
*** 218,222 ****
    async command error_t I2CPacket.write(i2c_flags_t flags, uint16_t addr, uint8_t length, uint8_t* data) {
      error_t error = SUCCESS;
-     uint8_t tmpAddr;
  
      error = startI2CTransact(I2C_STATE_WRITE,addr,length,data,flags,FALSE);
--- 217,220 ----