[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/rf230 RF230LayerP.nc, 1.9, 1.10 SoftwareAckLayerP.nc, 1.1, 1.2

[Miklos Maroti]

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

Modified Files:
	RF230LayerP.nc SoftwareAckLayerP.nc 
Log Message:
removed LPL debugging code

Index: RF230LayerP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/rf230/RF230LayerP.nc,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** RF230LayerP.nc	7 May 2008 21:33:13 -0000	1.9
--- RF230LayerP.nc	7 May 2008 23:24:47 -0000	1.10
***************
*** 313,317 ****
--- 313,319 ----
  		else if( cmd == CMD_TURNON && state == STATE_TRX_OFF && isSpiAcquired() )
  		{
+ 			ASSERT( ! radioIRQ );
  			call IRQ.captureRisingEdge();
+ 
  			writeRegister(RF230_TRX_STATE, RF230_RX_ON);
  			state = STATE_TRX_OFF_2_RX_ON;
***************
*** 321,324 ****
--- 323,328 ----
  		{
  			call IRQ.disable();
+ 			radioIrq = FALSE;
+ 
  			writeRegister(RF230_TRX_STATE, RF230_FORCE_TRX_OFF);
  			state = STATE_TRX_OFF;
***************
*** 659,678 ****
  				}
  				else
! 				{
! #ifdef RF230_DEBUG
! //					ASSERT(FALSE);
! 					if( call DiagMsg.record() )
! 					{
! 						call DiagMsg.str("assert pll");
! 						call DiagMsg.uint16(call RadioAlarm.getNow());
! 						call DiagMsg.hex8(readRegister(RF230_TRX_STATUS));
! 						call DiagMsg.hex8(readRegister(RF230_TRX_STATE));
! 						call DiagMsg.hex8(irq);
! 						call DiagMsg.uint8(state);
! 						call DiagMsg.uint8(cmd);
! 						call DiagMsg.send();
! 					}
! #endif
! 				}
  			}
  
--- 663,667 ----
  				}
  				else
! 					ASSERT(FALSE);
  			}
  
***************
*** 758,777 ****
  				}
  				else
! 				{
! #ifdef RF230_DEBUG
! //					ASSERT(FALSE);
! 					if( call DiagMsg.record() )
! 					{
! 						call DiagMsg.str("assert trx");
! 						call DiagMsg.uint16(call RadioAlarm.getNow());
! 						call DiagMsg.hex8(readRegister(RF230_TRX_STATUS));
! 						call DiagMsg.hex8(readRegister(RF230_TRX_STATE));
! 						call DiagMsg.hex8(irq);
! 						call DiagMsg.uint8(state);
! 						call DiagMsg.uint8(cmd);
! 						call DiagMsg.send();
! 					}
! #endif
! 				}
  			}
  		}
--- 747,751 ----
  				}
  				else
! 					ASSERT(FALSE);
  			}
  		}

Index: SoftwareAckLayerP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/rf230/SoftwareAckLayerP.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SoftwareAckLayerP.nc	5 Nov 2007 20:37:00 -0000	1.1
--- SoftwareAckLayerP.nc	7 May 2008 23:24:47 -0000	1.2
***************
*** 134,137 ****
--- 134,139 ----
  		if( state == STATE_ACK_WAIT )
  		{
+ 			ASSERT( !ack || call SoftwareAckConfig.verifyAckPacket(txMsg, msg) );
+ 
  			call RadioAlarm.cancel();
  			call SoftwareAckConfig.setAckReceived(txMsg, ack);