[Tinyos-2-commits] CVS: tinyos-2.x/tos/lib/net TrickleTimerImplP.nc, 1.5, 1.6

[Miklos Maroti]

Update of /cvsroot/tinyos/tinyos-2.x/tos/lib/net
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv15027

Modified Files:
	TrickleTimerImplP.nc 
Log Message:
fix "trickles[id].period << scale" overflow

Index: TrickleTimerImplP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/net/TrickleTimerImplP.nc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** TrickleTimerImplP.nc	30 Jul 2007 00:42:00 -0000	1.5
--- TrickleTimerImplP.nc	16 Jul 2009 13:00:08 -0000	1.6
***************
*** 263,267 ****
      newTime += rval;
      
!     trickles[id].remainder = (trickles[id].period << scale) - newTime;
      trickles[id].time += newTime;
      dbg("Trickle,TrickleTimes", "Generated time for %hhu with period %hu (%u) is %u (%i + %hu)\n", id, trickles[id].period, (uint32_t)trickles[id].period << scale, trickles[id].time, (trickles[id].period << (scale - 1)), rval);
--- 263,267 ----
      newTime += rval;
      
!     trickles[id].remainder = (((uint32_t)trickles[id].period) << scale) - newTime;
      trickles[id].time += newTime;
      dbg("Trickle,TrickleTimes", "Generated time for %hhu with period %hu (%u) is %u (%i + %hu)\n", id, trickles[id].period, (uint32_t)trickles[id].period << scale, trickles[id].time, (trickles[id].period << (scale - 1)), rval);