X-Git-Url: https://oss.titaniummirror.com/gitweb/?p=tinyos-2.x.git;a=blobdiff_plain;f=tos%2Fplatforms%2Firis%2FTimeSyncMessageC.nc;h=6e955c0a8a1ccf81320a2bdd72815e9a10d0ca55;hp=aca670b3732831ec602436d809aa0132a77e9d08;hb=e9bfab607e051bae6afb47b44892ce37541d1b44;hpb=adf1de6c009d13b7b52e68535c63b28f59c97400

diff --git a/tos/platforms/iris/TimeSyncMessageC.nc b/tos/platforms/iris/TimeSyncMessageC.nc
index aca670b3..6e955c0a 100644
--- 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;
 }