[Tinyos-2-commits] CVS: tinyos-2.x/tos/platforms/iris/chips/rf230 HplRF230C.nc, 1.6, 1.7 HplRF230P.nc, 1.1, 1.2 HplRF230.nc, 1.1, NONE

[Miklos Maroti]

Update of /cvsroot/tinyos/tinyos-2.x/tos/platforms/iris/chips/rf230
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv19552

Modified Files:
	HplRF230C.nc HplRF230P.nc 
Removed Files:
	HplRF230.nc 
Log Message:
separate the FastSpiInterface from the HplRF230 interface

Index: HplRF230C.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/platforms/iris/chips/rf230/HplRF230C.nc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** HplRF230C.nc	22 Jan 2009 20:05:03 -0000	1.6
--- HplRF230C.nc	6 Mar 2009 13:11:37 -0000	1.7
***************
*** 30,34 ****
  		interface GeneralIO as SELN;
  		interface Resource as SpiResource;
! 		interface SpiByte;
  
  		interface GeneralIO as SLP_TR;
--- 30,34 ----
  		interface GeneralIO as SELN;
  		interface Resource as SpiResource;
! 		interface FastSpiByte;
  
  		interface GeneralIO as SLP_TR;
***************
*** 52,58 ****
  	components Atm128SpiC as SpiC;
  	SpiResource = SpiC.Resource[unique("Atm128SpiC.Resource")];
- 	SpiByte = SpiC;
  
  	HplRF230 = HplRF230P;
  
  	components HplAtm128GeneralIOC as IO;
--- 52,58 ----
  	components Atm128SpiC as SpiC;
  	SpiResource = SpiC.Resource[unique("Atm128SpiC.Resource")];
  
  	HplRF230 = HplRF230P;
+ 	FastSpiByte = HplRF230P;
  
  	components HplAtm128GeneralIOC as IO;

Index: HplRF230P.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/platforms/iris/chips/rf230/HplRF230P.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** HplRF230P.nc	5 Nov 2007 20:37:21 -0000	1.1
--- HplRF230P.nc	6 Mar 2009 13:11:37 -0000	1.2
***************
*** 32,35 ****
--- 32,36 ----
  		interface Init as PlatformInit;
  
+ 		interface FastSpiByte;
  		interface HplRF230;
  	}
***************
*** 92,96 ****
  	}
  
! 	inline async command void HplRF230.spiSplitWrite(uint8_t data)
  	{
  		// the SPI must have been started, so do not waste time here
--- 93,97 ----
  	}
  
! 	inline async command void FastSpiByte.splitWrite(uint8_t data)
  	{
  		// the SPI must have been started, so do not waste time here
***************
*** 100,104 ****
  	}
  
! 	inline async command uint8_t HplRF230.spiSplitRead()
  	{
  	    while( !( SPSR & 0x80 ) )
--- 101,105 ----
  	}
  
! 	inline async command uint8_t FastSpiByte.splitRead()
  	{
  	    while( !( SPSR & 0x80 ) )
***************
*** 107,111 ****
  	}
  
! 	inline async command uint8_t HplRF230.spiSplitReadWrite(uint8_t data)
  	{
  		uint8_t b;
--- 108,112 ----
  	}
  
! 	inline async command uint8_t FastSpiByte.splitReadWrite(uint8_t data)
  	{
  		uint8_t b;
***************
*** 119,123 ****
  	}
  
! 	inline async command uint8_t HplRF230.spiWrite(uint8_t data)
  	{
  		// the SPI must have been started, so do not waste time here
--- 120,124 ----
  	}
  
! 	inline async command uint8_t FastSpiByte.write(uint8_t data)
  	{
  		// the SPI must have been started, so do not waste time here

--- HplRF230.nc DELETED ---