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

diff --git a/tos/chips/rf2xx/rf230/RF230ActiveMessageP.nc b/tos/chips/rf2xx/rf230/RF230ActiveMessageP.nc
index 7758d865..0b07d1eb 100644
--- a/tos/chips/rf2xx/rf230/RF230ActiveMessageP.nc
+++ b/tos/chips/rf2xx/rf230/RF230ActiveMessageP.nc
@@ -125,7 +125,9 @@ implementation
 
 	tasklet_async command void SoftwareAckConfig.reportChannelError()
 	{
+#ifdef TRAFFIC_MONITOR
 		signal TrafficMonitorConfig.channelError();
+#endif
 	}
 
 /*----------------- UniqueConfig -----------------*/
@@ -147,7 +149,9 @@ implementation
 
 	tasklet_async command void UniqueConfig.reportChannelError()
 	{
+#ifdef TRAFFIC_MONITOR
 		signal TrafficMonitorConfig.channelError();
+#endif
 	}
 
 /*----------------- ActiveMessageConfig -----------------*/
@@ -220,11 +224,6 @@ implementation
 		return call IEEE154MessageLayer.getSrcAddr(msg);
 	}
 
-	tasklet_async command void TrafficMonitorConfig.timerTick()
-	{
-		signal SlottedCollisionConfig.timerTick();
-	}
-
 /*----------------- RandomCollisionConfig -----------------*/
 
 	/*
@@ -300,8 +299,6 @@ implementation
 		return (uint16_t)(2 * 7 * 32 * RADIO_ALARM_MICROSEC);
 	}
 
-	default tasklet_async event void SlottedCollisionConfig.timerTick() { }
-
 /*----------------- Dummy -----------------*/
 
 	async command void DummyConfig.nothing()