make traffic monitor optional

[tinyos-2.x.git] / tos / chips / rf2xx / rf212 / RF212Ieee154MessageC.nc

diff --git a/tos/chips/rf2xx/rf212/RF212Ieee154MessageC.nc b/tos/chips/rf2xx/rf212/RF212Ieee154MessageC.nc
index 21eca29b0c8d064cf51f73a8a93b31942683bb8c..765afbe281c64aa128abf3107ddd652fbb96be24 100644 (file)
--- a/tos/chips/rf2xx/rf212/RF212Ieee154MessageC.nc
+++ b/tos/chips/rf2xx/rf212/RF212Ieee154MessageC.nc
@@ -36,6 +36,7 @@ configuration RF212Ieee154MessageC
                interface PacketAcknowledgements;
                interface LowPowerListening;
                interface PacketLink;
+               interface SendNotifier;
 
                interface RadioChannel;
 
@@ -67,10 +68,12 @@ implementation
        components IEEE154MessageLayerC;
        IEEE154MessageLayerC.SubPacket -> LowPowerListeningLayerC;
        IEEE154MessageLayerC.SubSend -> UniqueLayerC;
+       IEEE154MessageLayerC.SubReceive -> LowPowerListeningLayerC;
        Ieee154Send = IEEE154MessageLayerC;
        Packet = IEEE154MessageLayerC;
-       Ieee154Receive = LowPowerListeningLayerC;
+       Ieee154Receive = IEEE154MessageLayerC;
        Ieee154Packet = IEEE154MessageLayerC;
+       SendNotifier = IEEE154MessageLayerC;
 
 // -------- UniqueLayer Send part (wired twice)
 
@@ -105,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 -> CollisionAvoidanceLayerC;
        RadioChannel = MessageBufferLayerC;
 
 // -------- UniqueLayer receive part (wired twice)
 
-       UniqueLayerC.SubReceive -> TrafficMonitorLayerC;
-
-// -------- Traffic Monitor
-
-       components TrafficMonitorLayerC;
-       TrafficMonitorLayerC.Config -> RF212ActiveMessageP;
-       TrafficMonitorLayerC.SubSend -> CollisionAvoidanceLayerC;
-       TrafficMonitorLayerC.SubReceive -> CollisionAvoidanceLayerC;
-       TrafficMonitorLayerC.SubState -> RF212DriverLayerC;
+       UniqueLayerC.SubReceive -> CollisionAvoidanceLayerC;
 
 // -------- CollisionAvoidance