[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/msp430/usart Msp430I2CP.nc, 1.1.2.4, 1.1.2.5

[Jonathan Hui]

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

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

Remove debugging stuff.



Index: Msp430I2CP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/msp430/usart/Attic/Msp430I2CP.nc,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -d -r1.1.2.4 -r1.1.2.5
*** Msp430I2CP.nc	30 Aug 2006 17:15:55 -0000	1.1.2.4
--- Msp430I2CP.nc	30 Aug 2006 17:28:41 -0000	1.1.2.5
***************
*** 57,67 ****
    };
    
-   MSP430REG_NORACE(I2CTCTL);
-   MSP430REG_NORACE(I2CIE);
-   MSP430REG_NORACE(I2CIFG);
-   MSP430REG_NORACE(I2CDR);
-   MSP430REG_NORACE(I2CSA);
-   MSP430REG_NORACE(U0CTL);
-   
    norace uint8_t* m_buf;
    norace uint8_t m_len;
--- 57,60 ----
***************
*** 117,129 ****
      m_pos = 0;
  
!     call HplI2C.setMasterMode();//U0CTL |= MST;
!     call HplI2C.setReceiveMode();//I2CTCTL &= ~I2CTRX;
      
!     call HplI2C.setSlaveAddress( addr );//I2CSA = addr;
!     call HplI2C.enableReceiveReady();//I2CIE = RXRDYIE | ARDYIE | NACKIE;
      call HplI2C.enableAccessReady();
      call HplI2C.enableNoAck();
      if ( flags & I2C_START )
!       call HplI2C.setStartBit();//I2CTCTL |= I2CSTT;
      else
        nextRead();
--- 110,122 ----
      m_pos = 0;
  
!     call HplI2C.setMasterMode();
!     call HplI2C.setReceiveMode();
      
!     call HplI2C.setSlaveAddress( addr );
!     call HplI2C.enableReceiveReady();
      call HplI2C.enableAccessReady();
      call HplI2C.enableNoAck();
      if ( flags & I2C_START )
!       call HplI2C.setStartBit();
      else
        nextRead();
***************
*** 142,155 ****
      m_pos = 0;
      
!     call HplI2C.setMasterMode();//U0CTL |= MST;
!     call HplI2C.setTransmitMode();//I2CTCTL |= I2CTRX;
      
!     call HplI2C.setSlaveAddress( addr );//I2CSA = addr;
!     call HplI2C.enableTransmitReady();//I2CIE = TXRDYIE | ARDYIE | NACKIE;
      call HplI2C.enableAccessReady();
      call HplI2C.enableNoAck();
      
      if ( flags & I2C_START )
!       call HplI2C.setStartBit();//I2CTCTL |= I2CSTT;
      else
        nextWrite();
--- 135,148 ----
      m_pos = 0;
      
!     call HplI2C.setMasterMode();
!     call HplI2C.setTransmitMode();
      
!     call HplI2C.setSlaveAddress( addr );
!     call HplI2C.enableTransmitReady();
      call HplI2C.enableAccessReady();
      call HplI2C.enableNoAck();
      
      if ( flags & I2C_START )
!       call HplI2C.setStartBit();
      else
        nextWrite();
***************
*** 163,172 ****
      int i = 0;
      
!     TOSH_CLR_GREEN_LED_PIN();
!     switch( I2CIV ) {
        
      case 0x04:
        if ( I2CDCTL & I2CBB )
! 	call HplI2C.setStopBit();//I2CTCTL |= I2CSTP;
        while( I2CDCTL & I2CBUSY );
        signalDone( FAIL );
--- 156,164 ----
      int i = 0;
      
!     switch( call HplI2C.getIV() ) {
        
      case 0x04:
        if ( I2CDCTL & I2CBB )
! 	call HplI2C.setStopBit();
        while( I2CDCTL & I2CBUSY );
        signalDone( FAIL );
***************
*** 199,206 ****
    
    void nextRead() {
!     m_buf[ m_pos++ ] = I2CDR;
      if ( m_pos == m_len ) {
        if ( m_flags & I2C_STOP )
! 	call HplI2C.setStopBit();//I2CTCTL |= I2CSTP;
        else
  	signalDone( SUCCESS );
--- 191,198 ----
    
    void nextRead() {
!     m_buf[ m_pos++ ] = call HplI2C.getData();
      if ( m_pos == m_len ) {
        if ( m_flags & I2C_STOP )
! 	call HplI2C.setStopBit();
        else
  	signalDone( SUCCESS );
***************
*** 210,214 ****
    void nextWrite() {
      if ( ( m_pos == m_len - 1 ) && ( m_flags & I2C_STOP ) ) {
!       call HplI2C.setStopBit();//I2CTCTL |= I2CSTP;
      }
      else if ( m_pos == m_len ) {
--- 202,206 ----
    void nextWrite() {
      if ( ( m_pos == m_len - 1 ) && ( m_flags & I2C_STOP ) ) {
!       call HplI2C.setStopBit();
      }
      else if ( m_pos == m_len ) {
***************
*** 216,225 ****
        return;
      }
!     call HplI2C.setData( m_buf[ m_pos++ ] );//I2CDR = m_buf[ m_pos++ ];
    }
    
    void signalDone( error_t error ) {
      I2CIE = 0;
!     if ( I2CTCTL & I2CTRX )
        signal I2CBasicAddr.writeDone( error, I2CSA, m_len, m_buf );
      else
--- 208,217 ----
        return;
      }
!     call HplI2C.setData( m_buf[ m_pos++ ] );
    }
    
    void signalDone( error_t error ) {
      I2CIE = 0;
!     if ( call HplI2C.getTransmitReceiveMode() )
        signal I2CBasicAddr.writeDone( error, I2CSA, m_len, m_buf );
      else