Big commit of the default lpl. These changes deprecate TEP105.

[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..75d0715479393cdd39eed3b6ff81eca6c5610642 100644 (file)
--- a/tos/chips/rf2xx/layers/LowPowerListeningLayerC.nc
+++ b/tos/chips/rf2xx/layers/LowPowerListeningLayerC.nc
@@ -21,28 +21,25 @@
  * Author: Miklos Maroti
  */
 
-#include <LowPowerListeningLayer.h>
-
-#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 PacketData<lpl_metadata_t> as PacketLplMetadata;
-               interface IEEE154PacketLayer;
+               interface LowPowerListeningConfig as Config;
                interface PacketAcknowledgements;
        }
 }
@@ -50,18 +47,21 @@ configuration LowPowerListeningLayerC
 implementation
 {
        components LowPowerListeningLayerP, new TimerMilliC();
+       components SystemLowPowerListeningC;
 
        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;
+       LowPowerListeningLayerP.SystemLowPowerListening -> SystemLowPowerListeningC;
 }