Merge TinyOS 2.1.1 into master.

[tinyos-2.x.git] / tos / lib / ftsp / TimeSyncC.nc

diff --git a/tos/lib/ftsp/TimeSyncC.nc b/tos/lib/ftsp/TimeSyncC.nc
index 8022d8a9f6a354fcb06023aa9c1c191ff30a0e65..61cbcd93578f991aaf25de8fe0b5b6c2dac731e3 100644 (file)
--- a/tos/lib/ftsp/TimeSyncC.nc
+++ b/tos/lib/ftsp/TimeSyncC.nc
@@ -52,8 +52,8 @@ implementation
 
   components TimeSyncMessageC as ActiveMessageC;
   TimeSyncP.RadioControl    ->  ActiveMessageC;
-  TimeSyncP.Send            ->  ActiveMessageC.TimeSyncAMSendMilli[AM_TIMESYNCMSG];
-  TimeSyncP.Receive         ->  ActiveMessageC.Receive[AM_TIMESYNCMSG];
+  TimeSyncP.Send            ->  ActiveMessageC.TimeSyncAMSendMilli[TIMESYNC_AM_FTSP];
+  TimeSyncP.Receive         ->  ActiveMessageC.Receive[TIMESYNC_AM_FTSP];
   TimeSyncP.TimeSyncPacket  ->  ActiveMessageC;
 
   components HilTimerMilliC;
@@ -62,6 +62,9 @@ implementation
   components new TimerMilliC() as TimerC;
   TimeSyncP.Timer ->  TimerC;
 
+  components RandomC;
+  TimeSyncP.Random -> RandomC;
+
 #if defined(TIMESYNC_LEDS)
   components LedsC;
 #else