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

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

diff --git a/tos/chips/rf2xx/layers/ActiveMessageLayerC.nc b/tos/chips/rf2xx/layers/ActiveMessageLayerC.nc
index 055aaa729a3eace08120105d012f35a2ee5316dc..5404beca6ee5e26045276ce9373e0e4147c16b4a 100755 (executable)
--- a/tos/chips/rf2xx/layers/ActiveMessageLayerC.nc
+++ b/tos/chips/rf2xx/layers/ActiveMessageLayerC.nc
@@ -21,22 +21,24 @@
  * Author: Miklos Maroti
  */
 
-#include <ActiveMessageLayer.h>
-
 configuration ActiveMessageLayerC
 {
        provides
        {
+               interface RadioPacket;
                interface AMPacket;
+               interface Packet;
                interface AMSend[am_id_t id];
                interface Receive[am_id_t id];
                interface Receive as Snoop[am_id_t id]; 
+               interface SendNotifier[am_id_t id];
        }
 
        uses
        {
-               interface Send as SubSend;
-               interface Receive as SubReceive;
+               interface RadioPacket as SubPacket;
+               interface BareSend as SubSend;
+               interface BareReceive as SubReceive;
                interface ActiveMessageConfig as Config;
        }
 }
@@ -46,11 +48,15 @@ implementation
        components ActiveMessageLayerP, ActiveMessageAddressC;
        ActiveMessageLayerP.ActiveMessageAddress -> ActiveMessageAddressC;
 
+       RadioPacket = ActiveMessageLayerP;
        AMPacket = ActiveMessageLayerP;
+       Packet = ActiveMessageLayerP;
        AMSend = ActiveMessageLayerP;
        Receive = ActiveMessageLayerP.Receive;
        Snoop = ActiveMessageLayerP.Snoop;
+       SendNotifier = ActiveMessageLayerP;
        
+       SubPacket = ActiveMessageLayerP;
        SubSend = ActiveMessageLayerP;
        SubReceive = ActiveMessageLayerP;
        Config = ActiveMessageLayerP;