rename IEEE154Packet components to avoid a clash with blip

diff --git a/tos/chips/rf2xx/layers/LowPowerListeningLayerC.nc b/tos/chips/rf2xx/layers/LowPowerListeningLayerC.nc
index b1efca25b17cbfa5479c0c5f7df7b5d3eed04514..5cc93f00512aa088b276010886de7feaeb576090 100644 (file)
--- 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 ef4bac568622da67001c384b7a0f47ca8256962b..fc02621b69af7b9cf6bbfa28a2591427af0ca9f0 100644 (file)
--- 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;