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

[tinyos-2.x.git] / tos / chips / rf2xx / rf212 / RF212TimeSyncMessageC.nc

diff --git a/tos/chips/rf2xx/rf212/RF212TimeSyncMessageC.nc b/tos/chips/rf2xx/rf212/RF212TimeSyncMessageC.nc
index c066441ba6ebe3525c26e6f911fc6d2a2ef21175..c9dc5bd14890161234b5647023dbdeaf01e2ece2 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;
        }
@@ -47,19 +49,19 @@ implementation
        components RF212DriverLayerC, RF212ActiveMessageC, TimeSyncMessageLayerC;
   
        SplitControl    = RF212ActiveMessageC;
-       Receive         = RF212ActiveMessageC.Receive;
-       Snoop           = RF212ActiveMessageC.Snoop;
-       AMPacket        = RF212ActiveMessageC;
+       AMPacket        = TimeSyncMessageLayerC;
+       Receive         = TimeSyncMessageLayerC.Receive;
+       Snoop           = TimeSyncMessageLayerC.Snoop;
        Packet          = TimeSyncMessageLayerC;
 
+       PacketTimeStampRadio    = RF212ActiveMessageC;
        TimeSyncAMSendRadio     = TimeSyncMessageLayerC;
        TimeSyncPacketRadio     = TimeSyncMessageLayerC;
+
+       PacketTimeStampMilli    = RF212ActiveMessageC;
        TimeSyncAMSendMilli     = TimeSyncMessageLayerC;
        TimeSyncPacketMilli     = TimeSyncMessageLayerC;
 
-       TimeSyncMessageLayerC.SubSend -> RF212ActiveMessageC;
-       TimeSyncMessageLayerC.SubPacket -> RF212ActiveMessageC;
-
        TimeSyncMessageLayerC.PacketTimeStampRadio -> RF212ActiveMessageC;
        TimeSyncMessageLayerC.PacketTimeStampMilli -> RF212ActiveMessageC;