[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/gmu/McTorrent/tos/platform/pc SystemTimeM.nc, 1.1.1.1, 1.2

Leijun Huang lhuang2 at users.sourceforge.net
Thu Feb 15 13:13:15 PST 2007


Update of /cvsroot/tinyos/tinyos-1.x/contrib/gmu/McTorrent/tos/platform/pc
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv13454

Modified Files:
	SystemTimeM.nc 
Log Message:
Fixed wrong type cast in getCurrentTimeMillis().


Index: SystemTimeM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/gmu/McTorrent/tos/platform/pc/SystemTimeM.nc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** SystemTimeM.nc	10 Jan 2007 21:10:50 -0000	1.1.1.1
--- SystemTimeM.nc	15 Feb 2007 21:13:13 -0000	1.2
***************
*** 38,42 ****
          // 1 sec = 1024 ms, as used in timers.
          // x / 4000000 * 1024 = x * 4 / 15625
!         return (uint32_t)(tos_state.tos_time << 2)/(uint32_t)15625;
      }
  
--- 38,42 ----
          // 1 sec = 1024 ms, as used in timers.
          // x / 4000000 * 1024 = x * 4 / 15625
!         return (uint32_t)((tos_state.tos_time << 2)/(long long)15625);
      }
  



More information about the Tinyos-contrib-commits mailing list