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

[Jan-Hinrich Hauer]

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

Modified Files:
	VirtualizeAlarmC.nc 
Log Message:
Workaround for VirtualizeAlarmC.nc, so it can be parameterized with uint32_t on msp430 platforms; the current msp430-gcc v. 3.2.3 throws a Segmentation fault.


Index: VirtualizeAlarmC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/timer/VirtualizeAlarmC.nc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** VirtualizeAlarmC.nc	12 Dec 2006 18:23:32 -0000	1.5
--- VirtualizeAlarmC.nc	30 May 2008 16:25:10 -0000	1.6
***************
*** 133,137 ****
      for( id=0; id<NUM_ALARMS; id++ ) {
        if( m.isset[id] ) {
!         size_type elapsed = call AlarmFrom.getNow() - m.alarm[id].t0;
          if( m.alarm[id].dt <= elapsed ) {
            m.isset[id] = FALSE;
--- 133,140 ----
      for( id=0; id<NUM_ALARMS; id++ ) {
        if( m.isset[id] ) {
!         //size_type elapsed = call AlarmFrom.getNow() - m.alarm[id].t0;
!         //if( m.alarm[id].dt <= elapsed ) {
!         size_type t0 = m.alarm[id].t0;
!         size_type elapsed = call AlarmFrom.getNow() - t0;
          if( m.alarm[id].dt <= elapsed ) {
            m.isset[id] = FALSE;