support ActiveMessageC and Ieee154MessageC simultaneously

[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 29c6d944da4b70beba60246e3a478e60add7b5bf..8ca6dce1f82defeb622de5d551ce1b292104c098 100755 (executable)
--- a/tos/chips/rf2xx/layers/ActiveMessageLayerC.nc
+++ b/tos/chips/rf2xx/layers/ActiveMessageLayerC.nc
@@ -25,7 +25,6 @@ configuration ActiveMessageLayerC
 {
        provides
        {
-               interface RadioPacket;
                interface AMPacket;
                interface Packet;
                interface AMSend[am_id_t id];
@@ -37,8 +36,8 @@ configuration ActiveMessageLayerC
        uses
        {
                interface RadioPacket as SubPacket;
-               interface Send as SubSend;
-               interface Receive as SubReceive;
+               interface BareSend as SubSend;
+               interface BareReceive as SubReceive;
                interface ActiveMessageConfig as Config;
        }
 }
@@ -48,7 +47,6 @@ implementation
        components ActiveMessageLayerP, ActiveMessageAddressC;
        ActiveMessageLayerP.ActiveMessageAddress -> ActiveMessageAddressC;
 
-       RadioPacket = ActiveMessageLayerP;
        AMPacket = ActiveMessageLayerP;
        Packet = ActiveMessageLayerP;
        AMSend = ActiveMessageLayerP;