X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=tos%2Fchips%2Frf2xx%2Frf212%2FRF212ActiveMessageC.nc;h=46ef3b44c7f38f92dbb34828ef17f6d2129d4e84;hb=54538a754044acac23adbda11567f0e774ea1b80;hp=e75824e5c3981fb237a65f7603f9c024c8d9daf4;hpb=e855a271834e27716a9c5d79cbf364aac22eb3bd;p=tinyos-2.x.git diff --git a/tos/chips/rf2xx/rf212/RF212ActiveMessageC.nc b/tos/chips/rf2xx/rf212/RF212ActiveMessageC.nc index e75824e5..46ef3b44 100644 --- a/tos/chips/rf2xx/rf212/RF212ActiveMessageC.nc +++ b/tos/chips/rf2xx/rf212/RF212ActiveMessageC.nc @@ -90,7 +90,7 @@ implementation #else components LowpanNetworkLayerC; #endif - LowpanNetworkLayerC.SubSend -> UniqueLayerC; + LowpanNetworkLayerC.SubSend -> IEEE154MessageLayerC; LowpanNetworkLayerC.SubReceive -> LowPowerListeningLayerC; LowpanNetworkLayerC.SubPacket -> IEEE154MessageLayerC; @@ -98,6 +98,7 @@ implementation components IEEE154MessageLayerC; IEEE154MessageLayerC.SubPacket -> LowPowerListeningLayerC; + IEEE154MessageLayerC.SubSend -> UniqueLayerC; // -------- UniqueLayer Send part (wired twice) @@ -108,6 +109,7 @@ implementation // -------- Low Power Listening #ifdef LOW_POWER_LISTENING + #warning "*** USING LOW POWER LISTENING LAYER" components LowPowerListeningLayerC; LowPowerListeningLayerC.Config -> RF212ActiveMessageP; LowPowerListeningLayerC.PacketAcknowledgements -> SoftwareAckLayerC; @@ -124,6 +126,7 @@ implementation // -------- Packet Link #ifdef PACKET_LINK + #warning "*** USING PACKET LINK LAYER" components PacketLinkLayerC; PacketLink = PacketLinkLayerC; PacketLinkLayerC.PacketAcknowledgements -> SoftwareAckLayerC; @@ -136,7 +139,6 @@ implementation // -------- MessageBuffer components MessageBufferLayerC; - MessageBufferLayerC.Packet -> ActiveMessageLayerC; MessageBufferLayerC.RadioSend -> TrafficMonitorLayerC; MessageBufferLayerC.RadioReceive -> UniqueLayerC; MessageBufferLayerC.RadioState -> TrafficMonitorLayerC;