[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/rf230 RF230LayerP.nc, 1.11, 1.12

[Miklos Maroti]

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

Modified Files:
	RF230LayerP.nc 
Log Message:
add LPL tests and remove bad TX check from RF230LayerP

Index: RF230LayerP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/rf230/RF230LayerP.nc,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** RF230LayerP.nc	8 May 2008 19:41:27 -0000	1.11
--- RF230LayerP.nc	8 May 2008 21:31:13 -0000	1.12
***************
*** 470,486 ****
  		 * because of concurrent access, but that message probably cannot be
  		 * recovered.
  		 */
- 		if( (readRegister(RF230_TRX_STATUS) & RF230_TRX_STATUS_MASK) != RF230_BUSY_TX )
- 		{
- 			ASSERT( (readRegister(RF230_TRX_STATUS) & RF230_TRX_STATUS_MASK) == RF230_PLL_ON );
- 
- 			writeRegister(RF230_TRX_STATE, RF230_RX_ON);
- 			readRegister(RF230_IRQ_STATUS);
- 			radioIrq = FALSE;
- 
- 			call PacketTimeStamp.clear(msg);
- 
- 			return FAIL;
- 		}
  
  		// go back to RX_ON state when finished
--- 470,477 ----
  		 * because of concurrent access, but that message probably cannot be
  		 * recovered.
+ 		 *
+ 		 * TODO: this needs to be verified, and make sure that the chip is 
+ 		 * not locked up in this case.
  		 */
  
  		// go back to RX_ON state when finished