[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/rf2xx/layers LowPowerListeningLayerC.nc, 1.1, 1.2 LowPowerListeningLayerP.nc, 1.1, 1.2

[Miklos Maroti]

Update of /cvsroot/tinyos/tinyos-2.x/tos/chips/rf2xx/layers
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv6255

Modified Files:
	LowPowerListeningLayerC.nc LowPowerListeningLayerP.nc 
Log Message:
rename IEEE154Packet components to avoid a clash with blip

Index: LowPowerListeningLayerC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/rf2xx/layers/LowPowerListeningLayerC.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** LowPowerListeningLayerC.nc	10 Mar 2009 20:37:58 -0000	1.1
--- LowPowerListeningLayerC.nc	30 Mar 2009 21:20:15 -0000	1.2
***************
*** 41,45 ****
  
  		interface PacketField<uint16_t> as PacketSleepInterval;
! 		interface IEEE154Packet;
  		interface PacketAcknowledgements;
  	}
--- 41,45 ----
  
  		interface PacketField<uint16_t> as PacketSleepInterval;
! 		interface IEEE154Packet2;
  		interface PacketAcknowledgements;
  	}
***************
*** 59,63 ****
  	SubReceive = LowPowerListeningLayerP;
  	PacketSleepInterval = LowPowerListeningLayerP;
! 	IEEE154Packet = LowPowerListeningLayerP;
  	PacketAcknowledgements = LowPowerListeningLayerP;
  	
--- 59,63 ----
  	SubReceive = LowPowerListeningLayerP;
  	PacketSleepInterval = LowPowerListeningLayerP;
! 	IEEE154Packet2 = LowPowerListeningLayerP;
  	PacketAcknowledgements = LowPowerListeningLayerP;
  	

Index: LowPowerListeningLayerP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/rf2xx/layers/LowPowerListeningLayerP.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** LowPowerListeningLayerP.nc	10 Mar 2009 20:37:58 -0000	1.1
--- LowPowerListeningLayerP.nc	30 Mar 2009 21:20:15 -0000	1.2
***************
*** 42,46 ****
  
  		interface PacketField<uint16_t> as PacketSleepInterval;
! 		interface IEEE154Packet;
  		interface PacketAcknowledgements;
  		interface Timer<TMilli>;
--- 42,46 ----
  
  		interface PacketField<uint16_t> as PacketSleepInterval;
! 		interface IEEE154Packet2;
  		interface PacketAcknowledgements;
  		interface Timer<TMilli>;
***************
*** 336,340 ****
  			|| call LowPowerListening.getRxSleepInterval(msg) == 0
  			|| state == SEND_SUBSEND_DONE_LAST
! 			|| (call IEEE154Packet.getAckRequired(msg) && call PacketAcknowledgements.wasAcked(msg)) )
  		{
  			call Timer.stop();
--- 336,340 ----
  			|| call LowPowerListening.getRxSleepInterval(msg) == 0
  			|| state == SEND_SUBSEND_DONE_LAST
! 			|| (call IEEE154Packet2.getAckRequired(msg) && call PacketAcknowledgements.wasAcked(msg)) )
  		{
  			call Timer.stop();