[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/atm128/spi Atm128SpiP.nc, 1.1.2.9, 1.1.2.10

[Jonathan Hui]

Update of /cvsroot/tinyos/tinyos-2.x/tos/chips/atm128/spi
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv30064/chips/atm128/spi

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

Changes to SpiByte interface. Return received byte since error_t is no
longer returned.



Index: Atm128SpiP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/atm128/spi/Atm128SpiP.nc,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -C2 -d -r1.1.2.9 -r1.1.2.10
*** Atm128SpiP.nc	15 Aug 2006 11:59:08 -0000	1.1.2.9
--- Atm128SpiP.nc	28 Sep 2006 19:26:21 -0000	1.1.2.10
***************
*** 127,134 ****
    }
    
!   async command void SpiByte.write( uint8_t tx, uint8_t* rx ) {
      call Spi.write( tx );
      while ( !( SPSR & 0x80 ) );
!     *rx = call Spi.read();
    }
  
--- 127,134 ----
    }
    
!   async command uint8_t SpiByte.write( uint8_t tx ) {
      call Spi.write( tx );
      while ( !( SPSR & 0x80 ) );
!     return call Spi.read();
    }
  
***************
*** 177,183 ****
        uint8_t val;
        if (tx != NULL) 
! 	call SpiByte.write( tx[tmpPos], &val );
        else
! 	call SpiByte.write( 0, &val );
      
        if (rx != NULL) {
--- 177,183 ----
        uint8_t val;
        if (tx != NULL) 
! 	val = call SpiByte.write( tx[tmpPos] );
        else
! 	val = call SpiByte.write( 0 );
      
        if (rx != NULL) {