reorganized packet header handling, added RF212Ieee154MessageC for BLIP

[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 0c6898bfbf2e5cafae0f187685fcdd133a0a666b..f616167874aa8fd4369f55ec0c540b2e5cc04ba1 100644 (file)
--- a/tos/chips/rf2xx/layers/LowPowerListeningLayerC.nc
+++ b/tos/chips/rf2xx/layers/LowPowerListeningLayerC.nc
@@ -21,8 +21,6 @@
  * Author: Miklos Maroti
  */
 
-#include <LowPowerListeningLayer.h>
-
 #warning "*** USING LOW POWER LISTENING LAYER"
 
 configuration LowPowerListeningLayerC
@@ -32,6 +30,7 @@ configuration LowPowerListeningLayerC
                interface SplitControl;
                interface Send;
                interface Receive;
+               interface RadioPacket;
 
                interface LowPowerListening;
        }
@@ -40,9 +39,9 @@ configuration LowPowerListeningLayerC
                interface SplitControl as SubControl;
                interface Send as SubSend;
                interface Receive as SubReceive;
+               interface RadioPacket as SubPacket;
 
-               interface PacketData<lpl_metadata_t> as PacketLplMetadata;
-               interface IEEE154PacketLayer;
+               interface LowPowerListeningConfig as Config;
                interface PacketAcknowledgements;
        }
 }
@@ -54,13 +53,14 @@ implementation
        SplitControl = LowPowerListeningLayerP;
        Send = LowPowerListeningLayerP;
        Receive = LowPowerListeningLayerP;
+       RadioPacket = LowPowerListeningLayerP;
        LowPowerListening = LowPowerListeningLayerP;
 
        SubControl = LowPowerListeningLayerP;
        SubSend = LowPowerListeningLayerP;
        SubReceive = LowPowerListeningLayerP;
-       PacketLplMetadata = LowPowerListeningLayerP;
-       IEEE154PacketLayer = LowPowerListeningLayerP;
+       SubPacket = LowPowerListeningLayerP;
+       Config = LowPowerListeningLayerP;
        PacketAcknowledgements = LowPowerListeningLayerP;
        
        LowPowerListeningLayerP.Timer -> TimerMilliC;