From: mmaroti <mmaroti>
Date: Thu, 29 May 2008 20:09:33 +0000 (+0000)
Subject: IRIS: reworked the time sync implementation
X-Git-Tag: release_tinyos_2_1_0_0~360
X-Git-Url: https://oss.titaniummirror.com/gitweb/?p=tinyos-2.x.git;a=commitdiff_plain;h=bceebed6615bb5a994de83ca67ff492b18df3815

IRIS: reworked the time sync implementation
---

diff --git a/tos/chips/rf230/TimeSyncMessageC.nc b/tos/chips/rf230/TimeSyncMessageC.nc
index be189f32..3f23bdb5 100644
--- 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 81616cdf..a80906a6 100644
--- 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));
 	}