Proper MSP_BSL_FLAGS for telosa and telosb based platforms using TMI modular tos...

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

diff --git a/tos/chips/rf230/RF230LayerC.nc b/tos/chips/rf230/RF230LayerC.nc
index 3cd59d8a254fad08d04a332868f88ff355b942ba..5e842c0f3a17abca051196381121d20459f37f27 100644 (file)
--- a/tos/chips/rf230/RF230LayerC.nc
+++ b/tos/chips/rf230/RF230LayerC.nc
@@ -21,6 +21,8 @@
  * Author: Miklos Maroti
  */
 
+#include <HplRF230.h>
+
 configuration RF230LayerC
 {
        provides
@@ -31,20 +33,12 @@ configuration RF230LayerC
                interface RadioCCA;
        }
 
-       uses 
-       {
-               interface RF230Config;
-               interface PacketField<uint8_t> as PacketLinkQuality;
-               interface PacketField<uint8_t> as PacketTransmitPower;
-               interface PacketTimeStamp<TRF230, uint16_t>;
-
-               async event void lastTouch(message_t* msg);
-       }
+       uses interface RF230Config;
 }
 
 implementation
 {
-       components RF230LayerP, HplRF230C, BusyWaitMicroC, TaskletC, MainC, RadioAlarmC;
+       components RF230LayerP, HplRF230C, BusyWaitMicroC, TaskletC, MainC, RadioAlarmC, RF230PacketC, LocalTimeMicroC as LocalTimeRadioC;
 
        RadioState = RF230LayerP;
        RadioSend = RF230LayerP;
@@ -52,9 +46,13 @@ implementation
        RadioCCA = RF230LayerP;
 
        RF230Config = RF230LayerP;
-       PacketLinkQuality = RF230LayerP.PacketLinkQuality;
-       PacketTransmitPower = RF230LayerP.PacketTransmitPower;
-       PacketTimeStamp = RF230LayerP.PacketTimeStamp;
+
+       RF230LayerP.PacketLinkQuality -> RF230PacketC.PacketLinkQuality;
+       RF230LayerP.PacketTransmitPower -> RF230PacketC.PacketTransmitPower;
+       RF230LayerP.PacketRSSI -> RF230PacketC.PacketRSSI;
+       RF230LayerP.PacketTimeSyncOffset -> RF230PacketC.PacketTimeSyncOffset;
+       RF230LayerP.PacketTimeStamp -> RF230PacketC;
+       RF230LayerP.LocalTime -> LocalTimeRadioC;
 
        RF230LayerP.RadioAlarm -> RadioAlarmC.RadioAlarm[unique("RadioAlarm")];
        RadioAlarmC.Alarm -> HplRF230C.Alarm;
@@ -71,8 +69,6 @@ implementation
        RF230LayerP.Tasklet -> TaskletC;
        RF230LayerP.BusyWait -> BusyWaitMicroC;
 
-       lastTouch = RF230LayerP.lastTouch;
-
 #ifdef RF230_DEBUG
        components DiagMsgC;
        RF230LayerP.DiagMsg -> DiagMsgC;