*** empty log message ***

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

diff --git a/tos/chips/rf2xx/rf230/RF230ActiveMessageP.nc b/tos/chips/rf2xx/rf230/RF230ActiveMessageP.nc
index 57fa1c22acf2f91c1679c35fb3db242581fd60f5..301a110a818401f78afe19b0fb5516274b6dce17 100644 (file)
--- a/tos/chips/rf2xx/rf230/RF230ActiveMessageP.nc
+++ b/tos/chips/rf2xx/rf230/RF230ActiveMessageP.nc
@@ -118,14 +118,20 @@ implementation
                call IEEE154MessageLayer.createAckReply(data, ack);
        }
 
+#ifndef SOFTWAREACK_TIMEOUT
+#define SOFTWAREACK_TIMEOUT    1000
+#endif
+
        async command uint16_t SoftwareAckConfig.getAckTimeout()
        {
-               return (uint16_t)(800 * RADIO_ALARM_MICROSEC);
+               return (uint16_t)(SOFTWAREACK_TIMEOUT * RADIO_ALARM_MICROSEC);
        }
 
        tasklet_async command void SoftwareAckConfig.reportChannelError()
        {
+#ifdef TRAFFIC_MONITOR
                signal TrafficMonitorConfig.channelError();
+#endif
        }
 
 /*----------------- UniqueConfig -----------------*/
@@ -147,16 +153,13 @@ implementation
 
        tasklet_async command void UniqueConfig.reportChannelError()
        {
+#ifdef TRAFFIC_MONITOR
                signal TrafficMonitorConfig.channelError();
+#endif
        }
 
 /*----------------- ActiveMessageConfig -----------------*/
 
-       command bool ActiveMessageConfig.forgotToClear(message_t* msg)
-       {
-               return ! call IEEE154MessageLayer.isDataFrame(msg);
-       }
-
        command am_addr_t ActiveMessageConfig.destination(message_t* msg)
        {
                return call IEEE154MessageLayer.getDestAddr(msg);
@@ -225,11 +228,6 @@ implementation
                return call IEEE154MessageLayer.getSrcAddr(msg);
        }
 
-       tasklet_async command void TrafficMonitorConfig.timerTick()
-       {
-               signal SlottedCollisionConfig.timerTick();
-       }
-
 /*----------------- RandomCollisionConfig -----------------*/
 
        /*
@@ -305,8 +303,6 @@ implementation
                return (uint16_t)(2 * 7 * 32 * RADIO_ALARM_MICROSEC);
        }
 
-       default tasklet_async event void SlottedCollisionConfig.timerTick() { }
-
 /*----------------- Dummy -----------------*/
 
        async command void DummyConfig.nothing()