Use a dedicated (0x3D) AM type for all time sync messages

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

diff --git a/tos/chips/rf2xx/rf230/RF230TimeSyncMessageC.nc b/tos/chips/rf2xx/rf230/RF230TimeSyncMessageC.nc
index 2d7f495c4b8a6d2fb6df99193edb8b1a7860f73b..6e18b2445a79714539409253135f7b8895f2ee16 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;
        }
@@ -47,19 +49,19 @@ implementation
        components RF230DriverLayerC, RF230ActiveMessageC, TimeSyncMessageLayerC;
   
        SplitControl    = RF230ActiveMessageC;
-       Receive         = RF230ActiveMessageC.Receive;
-       Snoop           = RF230ActiveMessageC.Snoop;
-       AMPacket        = RF230ActiveMessageC;
+       AMPacket        = TimeSyncMessageLayerC;
+       Receive         = TimeSyncMessageLayerC.Receive;
+       Snoop           = TimeSyncMessageLayerC.Snoop;
        Packet          = TimeSyncMessageLayerC;
 
+       PacketTimeStampRadio    = RF230ActiveMessageC;
        TimeSyncAMSendRadio     = TimeSyncMessageLayerC;
        TimeSyncPacketRadio     = TimeSyncMessageLayerC;
+
+       PacketTimeStampMilli    = RF230ActiveMessageC;
        TimeSyncAMSendMilli     = TimeSyncMessageLayerC;
        TimeSyncPacketMilli     = TimeSyncMessageLayerC;
 
-       TimeSyncMessageLayerC.SubSend -> RF230ActiveMessageC;
-       TimeSyncMessageLayerC.SubPacket -> RF230ActiveMessageC;
-
        TimeSyncMessageLayerC.PacketTimeStampRadio -> RF230ActiveMessageC;
        TimeSyncMessageLayerC.PacketTimeStampMilli -> RF230ActiveMessageC;