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

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

diff --git a/tos/chips/rf2xx/layers/IEEE154MessageLayerC.nc b/tos/chips/rf2xx/layers/IEEE154MessageLayerC.nc
index 2040739fdf6950c8cbe18052bdb85a3c2a467b9d..8c93f42945e8dea3776d5e8469a5c5c656fd920a 100644 (file)
--- a/tos/chips/rf2xx/layers/IEEE154MessageLayerC.nc
+++ b/tos/chips/rf2xx/layers/IEEE154MessageLayerC.nc
@@ -26,11 +26,26 @@ configuration IEEE154MessageLayerC
        provides
        {
                interface IEEE154MessageLayer;
+               interface RadioPacket;
+
+               // for passthrough wiring
+               interface BareSend as Send;
+
+               // for gateway wiring
+               interface Ieee154Packet;
+               interface Packet;
+               interface Ieee154Send;
+               interface Receive as Ieee154Receive;
+               interface SendNotifier;
        }
 
        uses
        {
-               interface IEEE154MessageConfig as Config;
+               interface RadioPacket as SubPacket;
+               interface BareSend as SubSend;
+
+               // for gateway wiring
+               interface BareReceive as SubReceive;
        }
 }
 
@@ -40,5 +55,17 @@ implementation
        IEEE154MessageLayerP.ActiveMessageAddress -> ActiveMessageAddressC;
 
        IEEE154MessageLayer = IEEE154MessageLayerP;
-       Config = IEEE154MessageLayerP;
+       RadioPacket = IEEE154MessageLayerP;
+       SubPacket = IEEE154MessageLayerP;
+
+       // for passthrough
+       Send = IEEE154MessageLayerP;
+       SubSend = IEEE154MessageLayerP;
+
+       Ieee154Packet = IEEE154MessageLayerP;
+       Packet = IEEE154MessageLayerP;
+       Ieee154Send = IEEE154MessageLayerP;
+       Ieee154Receive = IEEE154MessageLayerP;
+       SubReceive = IEEE154MessageLayerP;
+       SendNotifier = IEEE154MessageLayerP;
 }