IRIS: reworked the time sync implementation

diff --git a/tos/chips/rf230/TimeSyncMessageC.nc b/tos/chips/rf230/TimeSyncMessageC.nc
index be189f32c1e041eb25389279521184ec8d5dcfad..3f23bdb5a447178b72220ee145ca2490a2700f79 100644 (file)
--- a/tos/chips/rf230/TimeSyncMessageC.nc
+++ b/tos/chips/rf230/TimeSyncMessageC.nc
@@ -46,7 +46,7 @@ configuration TimeSyncMessageC
 
 implementation
 {
-       components TimeSyncMessageP, RF230ActiveMessageC, LocalTimeMilliC, LocalTimeMicroC as LocalTimeRadioC;
+       components TimeSyncMessageP, RF230ActiveMessageC, LocalTimeMilliC, LocalTimeMicroC as LocalTimeRadioC, RF230PacketC;
 
        TimeSyncAMSendRadio = TimeSyncMessageP;
        TimeSyncPacketRadio = TimeSyncMessageP;
@@ -63,6 +63,8 @@ implementation
        TimeSyncMessageP.LocalTimeRadio -> LocalTimeRadioC;
        TimeSyncMessageP.LocalTimeMilli -> LocalTimeMilliC;
 
+       TimeSyncMessageP.PacketTimeSyncOffset -> RF230PacketC.PacketTimeSyncOffset;
+
        SplitControl = RF230ActiveMessageC;
        Receive = RF230ActiveMessageC.Receive;
        Snoop = RF230ActiveMessageC.Snoop;

diff --git a/tos/chips/rf230/TimeSyncMessageP.nc b/tos/chips/rf230/TimeSyncMessageP.nc
index 81616cdf49d467db8c5f059cb548fd52d312aa00..a80906a6d2d125b1a7d2dbb66179381a3dbeb8c6 100644 (file)
--- a/tos/chips/rf230/TimeSyncMessageP.nc
+++ b/tos/chips/rf230/TimeSyncMessageP.nc
@@ -46,6 +46,8 @@ module TimeSyncMessageP
 
                interface LocalTime<TRF230> as LocalTimeRadio;
                interface LocalTime<TMilli> as LocalTimeMilli;
+
+               interface PacketField<uint8_t> as PacketTimeSyncOffset;
        }
 }
 
@@ -92,6 +94,8 @@ implementation
                timesync_footer_t* footer = (timesync_footer_t*)(msg->data + len);
                footer->time_offset = (nx_int32_t)event_time;
 
+               call PacketTimeSyncOffset.set(msg, len);
+
                return call SubSend.send[id](addr, msg, len + sizeof(timesync_footer_t));
        }