From a651cc27b07fdde5e3e894d4ea3374cee451efcc Mon Sep 17 00:00:00 2001
From: mmaroti <mmaroti>
Date: Mon, 30 Mar 2009 21:20:15 +0000
Subject: [PATCH] rename IEEE154Packet components to avoid a clash with blip

---
 tos/chips/rf2xx/layers/LowPowerListeningLayerC.nc | 4 ++--
 tos/chips/rf2xx/layers/LowPowerListeningLayerP.nc | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tos/chips/rf2xx/layers/LowPowerListeningLayerC.nc b/tos/chips/rf2xx/layers/LowPowerListeningLayerC.nc
index b1efca25..5cc93f00 100644
--- a/tos/chips/rf2xx/layers/LowPowerListeningLayerC.nc
+++ b/tos/chips/rf2xx/layers/LowPowerListeningLayerC.nc
@@ -40,7 +40,7 @@ configuration LowPowerListeningLayerC
 		interface Receive as SubReceive;
 
 		interface PacketField<uint16_t> as PacketSleepInterval;
-		interface IEEE154Packet;
+		interface IEEE154Packet2;
 		interface PacketAcknowledgements;
 	}
 }
@@ -58,7 +58,7 @@ implementation
 	SubSend = LowPowerListeningLayerP;
 	SubReceive = LowPowerListeningLayerP;
 	PacketSleepInterval = LowPowerListeningLayerP;
-	IEEE154Packet = LowPowerListeningLayerP;
+	IEEE154Packet2 = LowPowerListeningLayerP;
 	PacketAcknowledgements = LowPowerListeningLayerP;
 	
 	LowPowerListeningLayerP.Timer -> TimerMilliC;
diff --git a/tos/chips/rf2xx/layers/LowPowerListeningLayerP.nc b/tos/chips/rf2xx/layers/LowPowerListeningLayerP.nc
index ef4bac56..fc02621b 100644
--- a/tos/chips/rf2xx/layers/LowPowerListeningLayerP.nc
+++ b/tos/chips/rf2xx/layers/LowPowerListeningLayerP.nc
@@ -41,7 +41,7 @@ module LowPowerListeningLayerP
 		interface Receive as SubReceive;
 
 		interface PacketField<uint16_t> as PacketSleepInterval;
-		interface IEEE154Packet;
+		interface IEEE154Packet2;
 		interface PacketAcknowledgements;
 		interface Timer<TMilli>;
 	}
@@ -335,7 +335,7 @@ implementation
 		if( error != SUCCESS
 			|| call LowPowerListening.getRxSleepInterval(msg) == 0
 			|| state == SEND_SUBSEND_DONE_LAST
-			|| (call IEEE154Packet.getAckRequired(msg) && call PacketAcknowledgements.wasAcked(msg)) )
+			|| (call IEEE154Packet2.getAckRequired(msg) && call PacketAcknowledgements.wasAcked(msg)) )
 		{
 			call Timer.stop();
 			state = SEND_DONE;
-- 
2.39.2