From: mmaroti <mmaroti>
Date: Mon, 9 Jun 2008 19:09:41 +0000 (+0000)
Subject: fix milli conversion (shift direction)
X-Git-Tag: release_tinyos_2_1_0_0~328
X-Git-Url: https://oss.titaniummirror.com/gitweb/?p=tinyos-2.x.git;a=commitdiff_plain;h=7afc213d920448029411a51c3eac88d0ba191090

fix milli conversion (shift direction)
---

diff --git a/tos/chips/rf230/TimeSyncMessageP.nc b/tos/chips/rf230/TimeSyncMessageP.nc
index a586b23a..c4f9ca3e 100644
--- a/tos/chips/rf230/TimeSyncMessageP.nc
+++ b/tos/chips/rf230/TimeSyncMessageP.nc
@@ -122,7 +122,7 @@ implementation
 	command error_t TimeSyncAMSendMilli.send[am_id_t id](am_addr_t addr, message_t* msg, uint8_t len, uint32_t event_time)
 	{
 		// compute elapsed time in millisecond
-		event_time = ((event_time - call LocalTimeMilli.get()) << 10) + call LocalTimeRadio.get();
+		event_time = ((int32_t)(event_time - call LocalTimeMilli.get()) << 10) + call LocalTimeRadio.get();
 
 		return call TimeSyncAMSendRadio.send[id](addr, msg, len, event_time);
 	}
@@ -183,6 +183,6 @@ implementation
 	{
 		timesync_relative_t* timesync = getFooter(msg);
 
-		return ((int32_t)(*timesync) << 10) + call PacketTimeStampMilli.timestamp(msg);
+		return ((int32_t)(*timesync) >> 10) + call PacketTimeStampMilli.timestamp(msg);
 	}
 }