[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/atm128/timer Atm128AlarmC.nc, 1.2, 1.3

[David Gay]

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

Modified Files:
	Atm128AlarmC.nc 
Log Message:
fix compare register values (need to be set one early)


Index: Atm128AlarmC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/atm128/timer/Atm128AlarmC.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Atm128AlarmC.nc	12 Jul 2006 17:01:28 -0000	1.2
--- Atm128AlarmC.nc	7 Aug 2006 22:57:37 -0000	1.3
***************
*** 97,100 ****
--- 97,103 ----
         predictable comparisons (the C integer promotion rules would make it
         hard to write correct code for the possible timer_size size's) */
+     /* Note: all HplAtm128Compare.set values have one subtracted, because
+        the comparisons are continuous, but the actual interrupt is signalled
+        at the next timer clock cycle. */
      if (t0 <= now)
        {
***************
*** 103,109 ****
  	if (guardedExpires >= t0 && // if it wraps, it's > now
  	    guardedExpires <= now) 
! 	  call HplAtm128Compare.set(call HplAtm128Timer.get() + mindt);
  	else
! 	  call HplAtm128Compare.set(expires);
        }
      else
--- 106,112 ----
  	if (guardedExpires >= t0 && // if it wraps, it's > now
  	    guardedExpires <= now) 
! 	  call HplAtm128Compare.set(call HplAtm128Timer.get() + mindt - 1);
  	else
! 	  call HplAtm128Compare.set(expires - 1);
        }
      else
***************
*** 112,118 ****
  	if (guardedExpires >= t0 || // didn't wrap so < now
  	    guardedExpires <= now)
! 	  call HplAtm128Compare.set(call HplAtm128Timer.get() + mindt);
  	else
! 	  call HplAtm128Compare.set(expires);
        }
      call HplAtm128Compare.reset();
--- 115,121 ----
  	if (guardedExpires >= t0 || // didn't wrap so < now
  	    guardedExpires <= now)
! 	  call HplAtm128Compare.set(call HplAtm128Timer.get() + mindt - 1);
  	else
! 	  call HplAtm128Compare.set(expires - 1);
        }
      call HplAtm128Compare.reset();