Apply bug fixes related to BLIP submitted by Lars Schor

[tinyos-2.x.git] / tos / chips / rf2xx / rf230 / RF230Ieee154MessageC.nc

diff --git a/tos/chips/rf2xx/rf230/RF230Ieee154MessageC.nc b/tos/chips/rf2xx/rf230/RF230Ieee154MessageC.nc
index 59b23960c20e7006bee6bd64045598543b75242a..553af9b889690fc74ebfdd6ada7e69a9fa717362 100644 (file)
--- a/tos/chips/rf2xx/rf230/RF230Ieee154MessageC.nc
+++ b/tos/chips/rf2xx/rf230/RF230Ieee154MessageC.nc
@@ -68,9 +68,10 @@ implementation
        components IEEE154MessageLayerC;
        IEEE154MessageLayerC.SubPacket -> LowPowerListeningLayerC;
        IEEE154MessageLayerC.SubSend -> UniqueLayerC;
+       IEEE154MessageLayerC.SubReceive -> LowPowerListeningLayerC;
        Ieee154Send = IEEE154MessageLayerC;
        Packet = IEEE154MessageLayerC;
-       Ieee154Receive = LowPowerListeningLayerC;
+       Ieee154Receive = IEEE154MessageLayerC;
        Ieee154Packet = IEEE154MessageLayerC;
        SendNotifier = IEEE154MessageLayerC;
 
@@ -107,23 +108,14 @@ implementation
 // -------- MessageBuffer
 
        components MessageBufferLayerC;
-       MessageBufferLayerC.Packet -> IEEE154MessageLayerC;     // to get the payload for the Ieee154Receive.receive
-       MessageBufferLayerC.RadioSend -> TrafficMonitorLayerC;
+       MessageBufferLayerC.RadioSend -> CollisionAvoidanceLayerC;
        MessageBufferLayerC.RadioReceive -> UniqueLayerC;
-       MessageBufferLayerC.RadioState -> TrafficMonitorLayerC;
+       MessageBufferLayerC.RadioState -> RF230DriverLayerC;
        RadioChannel = MessageBufferLayerC;
 
 // -------- UniqueLayer receive part (wired twice)
 
-       UniqueLayerC.SubReceive -> TrafficMonitorLayerC;
-
-// -------- Traffic Monitor
-
-       components TrafficMonitorLayerC;
-       TrafficMonitorLayerC.Config -> RF230ActiveMessageP;
-       TrafficMonitorLayerC.SubSend -> CollisionAvoidanceLayerC;
-       TrafficMonitorLayerC.SubReceive -> CollisionAvoidanceLayerC;
-       TrafficMonitorLayerC.SubState -> RF230DriverLayerC;
+       UniqueLayerC.SubReceive -> CollisionAvoidanceLayerC;
 
 // -------- CollisionAvoidance