[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/rf230 DefaultPacketP.nc, 1.4, 1.5 LowPowerListeningLayerP.nc, 1.4, 1.5 RF230LayerP.nc, 1.8, 1.9

[Miklos Maroti]

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

Modified Files:
	DefaultPacketP.nc LowPowerListeningLayerP.nc RF230LayerP.nc 
Log Message:
more LPL debugging

Index: DefaultPacketP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/rf230/DefaultPacketP.nc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** DefaultPacketP.nc	21 Apr 2008 20:58:08 -0000	1.4
--- DefaultPacketP.nc	7 May 2008 21:33:13 -0000	1.5
***************
*** 165,169 ****
  /*----------------- Global fields -----------------*/
  
! 	uint8_t flags;
  	enum
  	{
--- 165,169 ----
  /*----------------- Global fields -----------------*/
  
! 	norace uint8_t flags;
  	enum
  	{
***************
*** 172,177 ****
  	};
  
! 	uint8_t transmitPower;
! 	uint16_t sleepInterval;
  
  /*----------------- PacketTransmitPower -----------------*/
--- 172,179 ----
  	};
  
! 	norace uint8_t transmitPower;
! 
! 	// TODO: Move sleepInterval into the metadata
! 	norace uint16_t sleepInterval;
  
  /*----------------- PacketTransmitPower -----------------*/

Index: LowPowerListeningLayerP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/rf230/LowPowerListeningLayerP.nc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** LowPowerListeningLayerP.nc	7 May 2008 20:30:34 -0000	1.4
--- LowPowerListeningLayerP.nc	7 May 2008 21:33:13 -0000	1.5
***************
*** 268,281 ****
  	}
  
- 	void sleepIntervalChanged()
- 	{
- 		if( (state == LISTEN && sleepInterval == 0) || state == SLEEP )
- 		{
- 			call Timer.stop();
- 			--state;
- 			post transition();
- 		}
- 	}
- 
  	event message_t* SubReceive.receive(message_t* msg, void* payload, uint8_t len)
  	{
--- 268,271 ----
***************
*** 390,394 ****
  
  		sleepInterval = interval;
! 		sleepIntervalChanged();
  	}
  
--- 380,390 ----
  
  		sleepInterval = interval;
! 
! 		if( (state == LISTEN && sleepInterval == 0) || state == SLEEP )
! 		{
! 			call Timer.stop();
! 			--state;
! 			post transition();
! 		}
  	}
  

Index: RF230LayerP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/rf230/RF230LayerP.nc,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** RF230LayerP.nc	7 May 2008 20:29:36 -0000	1.8
--- RF230LayerP.nc	7 May 2008 21:33:13 -0000	1.9
***************
*** 659,663 ****
  				}
  				else
! 					ASSERT(FALSE);
  			}
  
--- 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
! 				}
  			}
  
***************
*** 743,747 ****
  				}
  				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
! 				}
  			}
  		}