Use BareSend/BareReceive instead of Send/Receive to avoid duplication of payload...

[tinyos-2.x.git] / tos / chips / rf2xx / layers / LowPowerListeningLayerC.nc

diff --git a/tos/chips/rf2xx/layers/LowPowerListeningLayerC.nc b/tos/chips/rf2xx/layers/LowPowerListeningLayerC.nc
index 5cc93f00512aa088b276010886de7feaeb576090..76f0a9a2477d0e135f81369a0365cfdddadb64ef 100644 (file)
--- a/tos/chips/rf2xx/layers/LowPowerListeningLayerC.nc
+++ b/tos/chips/rf2xx/layers/LowPowerListeningLayerC.nc
@@ -21,26 +21,25 @@
  * Author: Miklos Maroti
  */
 
-#warning "*** USING LOW POWER LISTENING LAYER"
-
 configuration LowPowerListeningLayerC
 {
        provides
        {
                interface SplitControl;
-               interface Send;
-               interface Receive;
+               interface BareSend as Send;
+               interface BareReceive as Receive;
+               interface RadioPacket;
 
                interface LowPowerListening;
        }
        uses
        {
                interface SplitControl as SubControl;
-               interface Send as SubSend;
-               interface Receive as SubReceive;
+               interface BareSend as SubSend;
+               interface BareReceive as SubReceive;
+               interface RadioPacket as SubPacket;
 
-               interface PacketField<uint16_t> as PacketSleepInterval;
-               interface IEEE154Packet2;
+               interface LowPowerListeningConfig as Config;
                interface PacketAcknowledgements;
        }
 }
@@ -52,13 +51,14 @@ implementation
        SplitControl = LowPowerListeningLayerP;
        Send = LowPowerListeningLayerP;
        Receive = LowPowerListeningLayerP;
+       RadioPacket = LowPowerListeningLayerP;
        LowPowerListening = LowPowerListeningLayerP;
 
        SubControl = LowPowerListeningLayerP;
        SubSend = LowPowerListeningLayerP;
        SubReceive = LowPowerListeningLayerP;
-       PacketSleepInterval = LowPowerListeningLayerP;
-       IEEE154Packet2 = LowPowerListeningLayerP;
+       SubPacket = LowPowerListeningLayerP;
+       Config = LowPowerListeningLayerP;
        PacketAcknowledgements = LowPowerListeningLayerP;
        
        LowPowerListeningLayerP.Timer -> TimerMilliC;