From: janhauer <janhauer>
Date: Fri, 30 May 2008 16:25:10 +0000 (+0000)
Subject: Workaround for VirtualizeAlarmC.nc, so it can be parameterized with uint32_t on msp43... 
X-Git-Tag: release_tinyos_2_1_0_0~356
X-Git-Url: https://oss.titaniummirror.com/gitweb/?p=tinyos-2.x.git;a=commitdiff_plain;h=889b4145bfa95a9379a7d87aefcd2464e87cbe24

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.
---

diff --git a/tos/lib/timer/VirtualizeAlarmC.nc b/tos/lib/timer/VirtualizeAlarmC.nc
index d558d99a..e7c65d43 100644
--- a/tos/lib/timer/VirtualizeAlarmC.nc
+++ b/tos/lib/timer/VirtualizeAlarmC.nc
@@ -132,7 +132,10 @@ implementation
 
     for( id=0; id<NUM_ALARMS; id++ ) {
       if( m.isset[id] ) {
-        size_type elapsed = call AlarmFrom.getNow() - m.alarm[id].t0;
+        //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;
           signal Alarm.fired[id]();