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 ff23c69cc7685dbf99e70017d95461125823a388..8c93f42945e8dea3776d5e8469a5c5c656fd920a 100644 (file)
--- a/tos/chips/rf2xx/layers/IEEE154MessageLayerC.nc
+++ b/tos/chips/rf2xx/layers/IEEE154MessageLayerC.nc
@@ -27,16 +27,25 @@ configuration IEEE154MessageLayerC
        {
                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 RadioPacket as SubPacket;
-               interface Send as SubSend;
+               interface BareSend as SubSend;
+
+               // for gateway wiring
+               interface BareReceive as SubReceive;
        }
 }
 
@@ -48,9 +57,15 @@ implementation
        IEEE154MessageLayer = IEEE154MessageLayerP;
        RadioPacket = IEEE154MessageLayerP;
        SubPacket = IEEE154MessageLayerP;
+
+       // for passthrough
+       Send = IEEE154MessageLayerP;
+       SubSend = IEEE154MessageLayerP;
+
        Ieee154Packet = IEEE154MessageLayerP;
        Packet = IEEE154MessageLayerP;
        Ieee154Send = IEEE154MessageLayerP;
-       SubSend = IEEE154MessageLayerP;
+       Ieee154Receive = IEEE154MessageLayerP;
+       SubReceive = IEEE154MessageLayerP;
        SendNotifier = IEEE154MessageLayerP;
 }