make traffic monitor optional

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

diff --git a/tos/chips/rf2xx/rf230/RF230ActiveMessageC.nc b/tos/chips/rf2xx/rf230/RF230ActiveMessageC.nc
index 4c9ab95d1ae200bc4ee9870487691c5bf16d36d4..e491ecae04cb3f57c024553d664d377f4fac89be 100644 (file)
--- a/tos/chips/rf2xx/rf230/RF230ActiveMessageC.nc
+++ b/tos/chips/rf2xx/rf230/RF230ActiveMessageC.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 -> RF230ActiveMessageP;
        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;
@@ -148,11 +150,15 @@ implementation
 
 // -------- Traffic Monitor
 
+#ifdef TRAFFIC_MONITOR
        components TrafficMonitorLayerC;
+#else
+       components new DummyLayerC() as TrafficMonitorLayerC;
+#endif
        TrafficMonitorLayerC.Config -> RF230ActiveMessageP;
-       TrafficMonitorLayerC.SubSend -> CollisionAvoidanceLayerC;
-       TrafficMonitorLayerC.SubReceive -> CollisionAvoidanceLayerC;
-       TrafficMonitorLayerC.SubState -> RF230DriverLayerC;
+       TrafficMonitorLayerC -> CollisionAvoidanceLayerC.RadioSend;
+       TrafficMonitorLayerC -> CollisionAvoidanceLayerC.RadioReceive;
+       TrafficMonitorLayerC -> RF230DriverLayerC.RadioState;
 
 // -------- CollisionAvoidance