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

[Phil Levis]

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

Modified Files:
	TrickleTimerImplP.nc 
Log Message:
Remove warnings.


Index: TrickleTimerImplP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/net/TrickleTimerImplP.nc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TrickleTimerImplP.nc	12 Dec 2006 18:23:29 -0000	1.4
--- TrickleTimerImplP.nc	30 Jul 2007 00:42:00 -0000	1.5
***************
*** 209,230 ****
      // since it was scheduled? This value is needed because
      // the time remaining of a running timer is its time
!     // value minus tiem elapsed.
      uint32_t elapsed = (call Timer.getNow() - call Timer.gett0());
  	
      for (i = 0; i < count; i++) {
!       uint32_t time = trickles[i].time;
!       if (time != 0) {
  	atomic {
  	  if (!call Changed.get(i)) {
  	    call Changed.clear(i);
! 	    time -= elapsed;
  	  }
  	}
  	if (!set) {
! 	  lowest = time;
  	  set = TRUE;
  	}
! 	else if (time < lowest) {
! 	  lowest = time;
  	}
        }
--- 209,230 ----
      // since it was scheduled? This value is needed because
      // the time remaining of a running timer is its time
!     // value minus time elapsed.
      uint32_t elapsed = (call Timer.getNow() - call Timer.gett0());
  	
      for (i = 0; i < count; i++) {
!       uint32_t timeRemaining = trickles[i].time;
!       if (timeRemaining != 0) {
  	atomic {
  	  if (!call Changed.get(i)) {
  	    call Changed.clear(i);
! 	    timeRemaining -= elapsed;
  	  }
  	}
  	if (!set) {
! 	  lowest = timeRemaining;
  	  set = TRUE;
  	}
! 	else if (timeRemaining < lowest) {
! 	  lowest = timeRemaining;
  	}
        }
***************
*** 245,249 ****
     */
    void generateTime(uint8_t id) {
!     uint32_t time;
      uint16_t rval;
      
--- 245,249 ----
     */
    void generateTime(uint8_t id) {
!     uint32_t newTime;
      uint16_t rval;
      
***************
*** 257,268 ****
      trickles[id].time = trickles[id].remainder;
      
!     time = trickles[id].period;
!     time = time << (scale - 1);
  
      rval = call Random.rand16() % (trickles[id].period << (scale - 1));
!     time += rval;
      
!     trickles[id].remainder = (trickles[id].period << scale) - time;
!     trickles[id].time += time;
      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);
    }
--- 257,268 ----
      trickles[id].time = trickles[id].remainder;
      
!     newTime = trickles[id].period;
!     newTime = newTime << (scale - 1);
  
      rval = call Random.rand16() % (trickles[id].period << (scale - 1));
!     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);
    }