Merge TinyOS 2.1.1 into master.

[tinyos-2.x.git] / tos / platforms / iris / TimeSyncMessageC.nc

diff --git a/tos/platforms/iris/TimeSyncMessageC.nc b/tos/platforms/iris/TimeSyncMessageC.nc
index aca670b3732831ec602436d809aa0132a77e9d08..6e955c0a8a1ccf81320a2bdd72815e9a10d0ca55 100644 (file)
--- a/tos/platforms/iris/TimeSyncMessageC.nc
+++ b/tos/platforms/iris/TimeSyncMessageC.nc
@@ -21,7 +21,7 @@
  * Author: Miklos Maroti
  */
 
-#include <HplRF230.h>
+#include <RadioConfig.h>
 
 configuration TimeSyncMessageC
 {
@@ -34,9 +34,11 @@ configuration TimeSyncMessageC
                interface Packet;
                interface AMPacket;
 
-               interface TimeSyncAMSend<TRF230, uint32_t> as TimeSyncAMSendRadio[am_id_t id];
-               interface TimeSyncPacket<TRF230, uint32_t> as TimeSyncPacketRadio;
+               interface PacketTimeStamp<TRadio, uint32_t> as PacketTimeStampRadio;
+               interface TimeSyncAMSend<TRadio, uint32_t> as TimeSyncAMSendRadio[am_id_t id];
+               interface TimeSyncPacket<TRadio, uint32_t> as TimeSyncPacketRadio;
 
+               interface PacketTimeStamp<TMilli, uint32_t> as PacketTimeStampMilli;
                interface TimeSyncAMSend<TMilli, uint32_t> as TimeSyncAMSendMilli[am_id_t id];
                interface TimeSyncPacket<TMilli, uint32_t> as TimeSyncPacketMilli;
        }
@@ -44,17 +46,19 @@ configuration TimeSyncMessageC
 
 implementation
 {
-       components RF230TimeSyncMessageC;
+       components RF230TimeSyncMessageC as MessageC;
   
-       SplitControl = RF230TimeSyncMessageC;
-  
-       Receive         = RF230TimeSyncMessageC.Receive;
-       Snoop           = RF230TimeSyncMessageC.Snoop;
-       Packet          = RF230TimeSyncMessageC;
-       AMPacket        = RF230TimeSyncMessageC;
-
-       TimeSyncAMSendRadio = RF230TimeSyncMessageC;
-       TimeSyncPacketRadio = RF230TimeSyncMessageC;
-       TimeSyncAMSendMilli = RF230TimeSyncMessageC;
-       TimeSyncPacketMilli = RF230TimeSyncMessageC;
+       SplitControl    = MessageC;
+       Receive         = MessageC.Receive;
+       Snoop           = MessageC.Snoop;
+       Packet          = MessageC;
+       AMPacket        = MessageC;
+
+       PacketTimeStampRadio    = MessageC;
+       TimeSyncAMSendRadio     = MessageC;
+       TimeSyncPacketRadio     = MessageC;
+
+       PacketTimeStampMilli    = MessageC;
+       TimeSyncAMSendMilli     = MessageC;
+       TimeSyncPacketMilli     = MessageC;
 }