Use the AM_TIMESYNCMSG name for the active message ID used by all time sync messages

diff --git a/tos/chips/rf2xx/layers/TimeSyncMessageLayer.h b/tos/chips/rf2xx/layers/TimeSyncMessageLayer.h
index dbb1c10d90c8f3786e93bcc2b05900bd4ea7b468..7c930a657467ee89893c96887246c36a222e0bb1 100644 (file)
--- a/tos/chips/rf2xx/layers/TimeSyncMessageLayer.h
+++ b/tos/chips/rf2xx/layers/TimeSyncMessageLayer.h
@@ -26,8 +26,8 @@
 
 #include <AM.h>
 
-#ifndef TIMESYNC_AMTYPE
-#define TIMESYNC_AMTYPE 0x3D
+#ifndef AM_TIMESYNCMSG
+#define AM_TIMESYNCMSG 0x3D
 #endif
 
 // this is sent over the air

diff --git a/tos/chips/rf2xx/layers/TimeSyncMessageLayerC.nc b/tos/chips/rf2xx/layers/TimeSyncMessageLayerC.nc
index 9853aeb2fc8affcb036466db6b5312afd78b7307..b1643522c8ef72280aa975d47ad550419cc3b889 100644 (file)
--- a/tos/chips/rf2xx/layers/TimeSyncMessageLayerC.nc
+++ b/tos/chips/rf2xx/layers/TimeSyncMessageLayerC.nc
@@ -69,14 +69,14 @@ implementation
        TimeSyncPacketMilli = TimeSyncMessageLayerP;
 
        // Ok, we use the AMSenderC infrastructure to avoid concurrent send clashes
-       components new AMSenderC(TIMESYNC_AMTYPE);
+       components new AMSenderC(AM_TIMESYNCMSG);
        TimeSyncMessageLayerP.SubAMSend -> AMSenderC;
        TimeSyncMessageLayerP.SubAMPacket -> AMSenderC;
        TimeSyncMessageLayerP.SubPacket -> AMSenderC;
 
        components ActiveMessageC;
-       TimeSyncMessageLayerP.SubReceive -> ActiveMessageC.Receive[TIMESYNC_AMTYPE];
-       TimeSyncMessageLayerP.SubSnoop -> ActiveMessageC.Snoop[TIMESYNC_AMTYPE];;
+       TimeSyncMessageLayerP.SubReceive -> ActiveMessageC.Receive[AM_TIMESYNCMSG];
+       TimeSyncMessageLayerP.SubSnoop -> ActiveMessageC.Snoop[AM_TIMESYNCMSG];;
 
        PacketTimeStampRadio = TimeSyncMessageLayerP;
        PacketTimeStampMilli = TimeSyncMessageLayerP;

diff --git a/tos/chips/rf2xx/layers/TimeSyncMessageLayerP.nc b/tos/chips/rf2xx/layers/TimeSyncMessageLayerP.nc
index e8698976a9174b4ce92a8027295fadb2feafc741..b7e9b4d213e162d8fa1f69395fdcc3d9f049fe4a 100644 (file)
--- a/tos/chips/rf2xx/layers/TimeSyncMessageLayerP.nc
+++ b/tos/chips/rf2xx/layers/TimeSyncMessageLayerP.nc
@@ -106,7 +106,7 @@ implementation
 
        inline command bool AMPacket.isForMe(message_t* msg)
        {
-               return call SubAMPacket.isForMe(msg) && call SubAMPacket.type(msg) == TIMESYNC_AMTYPE;
+               return call SubAMPacket.isForMe(msg) && call SubAMPacket.type(msg) == AM_TIMESYNCMSG;
        }
 
        inline command am_addr_t AMPacket.destination(message_t* msg)