Expose the PacketTimeStamp interfaces in TimeSyncMessageC

diff --git a/tos/chips/rf2xx/rf212/RF212RadioC.nc b/tos/chips/rf2xx/rf212/RF212RadioC.nc
index fda050c1a7bbd467a92e8b0a8a6d056c35e889b9..90d1f1abe90f9e3dedc68e3e1c7178a52a66cf1a 100644 (file)
--- a/tos/chips/rf2xx/rf212/RF212RadioC.nc
+++ b/tos/chips/rf2xx/rf212/RF212RadioC.nc
@@ -23,10 +23,6 @@
 
 #include <RadioConfig.h>
 
-#ifndef TFRAMES_ENABLED
-#define PACKET_LINK
-#endif
-
 configuration RF212RadioC
 {
        provides 

diff --git a/tos/chips/rf2xx/rf212/RF212TimeSyncMessageC.nc b/tos/chips/rf2xx/rf212/RF212TimeSyncMessageC.nc
index 0047d32d0abae409582e99711125464425e9e3c3..7d9ecd602313b1a18f76ef2031c70841b9fc9d71 100644 (file)
--- a/tos/chips/rf2xx/rf212/RF212TimeSyncMessageC.nc
+++ b/tos/chips/rf2xx/rf212/RF212TimeSyncMessageC.nc
@@ -28,15 +28,17 @@ configuration RF212TimeSyncMessageC
        provides
        {
                interface SplitControl;
+
                interface Receive[uint8_t id];
                interface Receive as Snoop[am_id_t id];
-               interface AMPacket;
-
                interface Packet;
+               interface AMPacket;
 
+               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;
        }
@@ -52,8 +54,11 @@ implementation
        AMPacket        = RF212ActiveMessageC;
        Packet          = TimeSyncMessageLayerC;
 
+       PacketTimeStampRadio    = RF212ActiveMessageC;
        TimeSyncAMSendRadio     = TimeSyncMessageLayerC;
        TimeSyncPacketRadio     = TimeSyncMessageLayerC;
+
+       PacketTimeStampMilli    = RF212ActiveMessageC;
        TimeSyncAMSendMilli     = TimeSyncMessageLayerC;
        TimeSyncPacketMilli     = TimeSyncMessageLayerC;
 

diff --git a/tos/chips/rf2xx/rf230/RF230RadioC.nc b/tos/chips/rf2xx/rf230/RF230RadioC.nc
index 55381be9cbe910dab066e3bd30d0d81b6627b54e..dbec5f5a7e30d42858a422c7f7484663d6f22e6e 100644 (file)
--- a/tos/chips/rf2xx/rf230/RF230RadioC.nc
+++ b/tos/chips/rf2xx/rf230/RF230RadioC.nc
@@ -23,10 +23,6 @@
 
 #include <RadioConfig.h>
 
-#ifndef TFRAMES_ENABLED
-#define PACKET_LINK
-#endif
-
 configuration RF230RadioC
 {
        provides 

diff --git a/tos/chips/rf2xx/rf230/RF230TimeSyncMessageC.nc b/tos/chips/rf2xx/rf230/RF230TimeSyncMessageC.nc
index 2319aa085d17e01c2f6157ea3d0254f93439c1b9..b308d10c5162716c1c32a8c79bf8ccb289da1a72 100644 (file)
--- a/tos/chips/rf2xx/rf230/RF230TimeSyncMessageC.nc
+++ b/tos/chips/rf2xx/rf230/RF230TimeSyncMessageC.nc
@@ -28,15 +28,17 @@ configuration RF230TimeSyncMessageC
        provides
        {
                interface SplitControl;
+
                interface Receive[uint8_t id];
                interface Receive as Snoop[am_id_t id];
-               interface AMPacket;
-
                interface Packet;
+               interface AMPacket;
 
+               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;
        }
@@ -52,8 +54,11 @@ implementation
        AMPacket        = RF230ActiveMessageC;
        Packet          = TimeSyncMessageLayerC;
 
+       PacketTimeStampRadio    = RF230ActiveMessageC;
        TimeSyncAMSendRadio     = TimeSyncMessageLayerC;
        TimeSyncPacketRadio     = TimeSyncMessageLayerC;
+
+       PacketTimeStampMilli    = RF230ActiveMessageC;
        TimeSyncAMSendMilli     = TimeSyncMessageLayerC;
        TimeSyncPacketMilli     = TimeSyncMessageLayerC;
 

diff --git a/tos/platforms/iris/ActiveMessageC.nc b/tos/platforms/iris/ActiveMessageC.nc
index a4c2ae7784572e2bda1a8e0016329548f99957e6..e95827470fe9e07816e2d056455c99cc34a3f8a9 100644 (file)
--- a/tos/platforms/iris/ActiveMessageC.nc
+++ b/tos/platforms/iris/ActiveMessageC.nc
@@ -21,6 +21,8 @@
  * Author: Miklos Maroti
  */
 
+#include <RadioConfig.h>
+
 configuration ActiveMessageC
 {
        provides

diff --git a/tos/platforms/iris/TimeSyncMessageC.nc b/tos/platforms/iris/TimeSyncMessageC.nc
index e39b4929cdde5f3b62f23ed3b1f9096682a7dafc..6e955c0a8a1ccf81320a2bdd72815e9a10d0ca55 100644 (file)
--- a/tos/platforms/iris/TimeSyncMessageC.nc
+++ b/tos/platforms/iris/TimeSyncMessageC.nc
@@ -34,9 +34,11 @@ configuration TimeSyncMessageC
                interface Packet;
                interface AMPacket;
 
+               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,16 +46,19 @@ configuration TimeSyncMessageC
 
 implementation
 {
-       components RF230TimeSyncMessageC as MAC;
+       components RF230TimeSyncMessageC as MessageC;
   
-       SplitControl    = MAC;
-       Receive         = MAC.Receive;
-       Snoop           = MAC.Snoop;
-       Packet          = MAC;
-       AMPacket        = MAC;
-
-       TimeSyncAMSendRadio     = MAC;
-       TimeSyncPacketRadio     = MAC;
-       TimeSyncAMSendMilli     = MAC;
-       TimeSyncPacketMilli     = MAC;
+       SplitControl    = MessageC;
+       Receive         = MessageC.Receive;
+       Snoop           = MessageC.Snoop;
+       Packet          = MessageC;
+       AMPacket        = MessageC;
+
+       PacketTimeStampRadio    = MessageC;
+       TimeSyncAMSendRadio     = MessageC;
+       TimeSyncPacketRadio     = MessageC;
+
+       PacketTimeStampMilli    = MessageC;
+       TimeSyncAMSendMilli     = MessageC;
+       TimeSyncPacketMilli     = MessageC;
 }

diff --git a/tos/platforms/iris/chips/rf230/RadioConfig.h b/tos/platforms/iris/chips/rf230/RadioConfig.h
index 106b2b5561ed35324c29cbfdaa38f771a0b9581c..42c7e2e30c6491fd17b348c8b3e1165e8d55d703 100644 (file)
--- a/tos/platforms/iris/chips/rf230/RadioConfig.h
+++ b/tos/platforms/iris/chips/rf230/RadioConfig.h
@@ -89,4 +89,11 @@ typedef TOne TRadio;
  */
 #define RADIO_ALARM_MILLI_EXP  (5 + MICA_DIVIDE_ONE_FOR_32KHZ_LOG2)
 
+/**
+ * Make PACKET_LINK automaticaly enabled for Ieee154MessageC
+ */
+#if !defined(TFRAMES_ENABLED) && !defined(PACKET_LINK)
+#define PACKET_LINK
+#endif
+
 #endif//__RADIOCONFIG_H__