X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=tos%2Fchips%2Frf2xx%2Frf230%2FRF230Ieee154MessageC.nc;h=856e2fa07916d7da50d592caee71c7a620a6d0b9;hb=00e708814493e030803019f2a98f3fe7e707805d;hp=ae17a95757331be28b18c9b9e9de4257e8744214;hpb=dc4dce097c72bddb275f8937df163b1e4041551c;p=tinyos-2.x.git

diff --git a/tos/chips/rf2xx/rf230/RF230Ieee154MessageC.nc b/tos/chips/rf2xx/rf230/RF230Ieee154MessageC.nc
index ae17a957..856e2fa0 100644
--- a/tos/chips/rf2xx/rf230/RF230Ieee154MessageC.nc
+++ b/tos/chips/rf2xx/rf230/RF230Ieee154MessageC.nc
@@ -108,22 +108,14 @@ implementation
 // -------- MessageBuffer
 
 	components MessageBufferLayerC;
-	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 -> RF230ActiveMessageP;
-	TrafficMonitorLayerC.SubSend -> CollisionAvoidanceLayerC;
-	TrafficMonitorLayerC.SubReceive -> CollisionAvoidanceLayerC;
-	TrafficMonitorLayerC.SubState -> RF230DriverLayerC;
+	UniqueLayerC.SubReceive -> CollisionAvoidanceLayerC;
 
 // -------- CollisionAvoidance