rename the TRF230 timer to TRadio

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

diff --git a/tos/chips/rf230/RF230ActiveMessageC.nc b/tos/chips/rf230/RF230ActiveMessageC.nc
index 34315e912955e4833998899386b52e93ad4d923b..9b8e714162c7c482464c20f130a32a724721b843 100644 (file)
--- a/tos/chips/rf230/RF230ActiveMessageC.nc
+++ b/tos/chips/rf230/RF230ActiveMessageC.nc
@@ -42,7 +42,7 @@ configuration RF230ActiveMessageC
                interface PacketField<uint8_t> as PacketTransmitPower;
                interface PacketField<uint8_t> as PacketRSSI;
 
-               interface PacketTimeStamp<TRF230, uint32_t> as PacketTimeStampRadio;
+               interface PacketTimeStamp<TRadio, uint32_t> as PacketTimeStampRadio;
                interface PacketTimeStamp<TMilli, uint32_t> as PacketTimeStampMilli;
        }
 }
@@ -70,18 +70,16 @@ implementation
        LowPowerListening = LowPowerListeningLayerC;
 
        components ActiveMessageLayerC;
-#ifdef LOW_POWER_LISTENING
-       components LowPowerListeningLayerC;
-#else  
-       components new DummyLayerC() as LowPowerListeningLayerC;
-#endif
-
 #ifdef TFRAMES_ENABLED
        components new DummyLayerC() as IEEE154NetworkLayerC;
 #else
        components IEEE154NetworkLayerC;
 #endif
-
+#ifdef LOW_POWER_LISTENING
+       components LowPowerListeningLayerC;
+#else  
+       components new DummyLayerC() as LowPowerListeningLayerC;
+#endif
        components MessageBufferLayerC;
        components UniqueLayerC;
        components TrafficMonitorLayerC;
@@ -101,9 +99,13 @@ implementation
 
        ActiveMessageLayerC.Config -> RF230ActiveMessageP;
        ActiveMessageLayerC.AMPacket -> IEEE154PacketC;
-       ActiveMessageLayerC.SubSend -> UniqueLayerC;
-       ActiveMessageLayerC.SubReceive -> LowPowerListeningLayerC;
+       ActiveMessageLayerC.SubSend -> IEEE154NetworkLayerC;
+       ActiveMessageLayerC.SubReceive -> IEEE154NetworkLayerC;
+
+       IEEE154NetworkLayerC.SubSend -> UniqueLayerC;
+       IEEE154NetworkLayerC.SubReceive -> LowPowerListeningLayerC;
 
+       // the UniqueLayer is wired at two points
        UniqueLayerC.Config -> RF230ActiveMessageP;
        UniqueLayerC.SubSend -> LowPowerListeningLayerC;