[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/rf230 TimeSyncMessageP.nc, 1.6, 1.7

[Miklos Maroti]

Update of /cvsroot/tinyos/tinyos-2.x/tos/chips/rf230
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv11733

Modified Files:
	TimeSyncMessageP.nc 
Log Message:
fix milli conversion (shift direction)

Index: TimeSyncMessageP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/rf230/TimeSyncMessageP.nc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** TimeSyncMessageP.nc	5 Jun 2008 20:44:21 -0000	1.6
--- TimeSyncMessageP.nc	9 Jun 2008 19:09:41 -0000	1.7
***************
*** 123,127 ****
  	{
  		// compute elapsed time in millisecond
! 		event_time = ((event_time - call LocalTimeMilli.get()) << 10) + call LocalTimeRadio.get();
  
  		return call TimeSyncAMSendRadio.send[id](addr, msg, len, event_time);
--- 123,127 ----
  	{
  		// compute elapsed time in millisecond
! 		event_time = ((int32_t)(event_time - call LocalTimeMilli.get()) << 10) + call LocalTimeRadio.get();
  
  		return call TimeSyncAMSendRadio.send[id](addr, msg, len, event_time);
***************
*** 184,188 ****
  		timesync_relative_t* timesync = getFooter(msg);
  
! 		return ((int32_t)(*timesync) << 10) + call PacketTimeStampMilli.timestamp(msg);
  	}
  }
--- 184,188 ----
  		timesync_relative_t* timesync = getFooter(msg);
  
! 		return ((int32_t)(*timesync) >> 10) + call PacketTimeStampMilli.timestamp(msg);
  	}
  }