+ fixed an issue with 62500Hz Alarms when overlapping

[tinyos-2.x.git] / tos / platforms / telosb / mac / tkn154 / timer / Alarm62500hz32VirtualizedC.nc

diff --git a/tos/platforms/telosb/mac/tkn154/timer/Alarm62500hz32VirtualizedC.nc b/tos/platforms/telosb/mac/tkn154/timer/Alarm62500hz32VirtualizedC.nc
index 7b946a7674bd954afa67aec059948720579bacc1..fde9e2ea9dbc24dc24fc81414a0dff17dae125f9 100644 (file)
--- a/tos/platforms/telosb/mac/tkn154/timer/Alarm62500hz32VirtualizedC.nc
+++ b/tos/platforms/telosb/mac/tkn154/timer/Alarm62500hz32VirtualizedC.nc
@@ -21,9 +21,6 @@
 
 /**
  * Alarm62500hzC is the alarm for async 62500hz alarms (virtualized)
- * This is the place where we cheat: since we don't have a clock source
- * running at 62500 Hz, we cast 2 symbols to 1 tick of the 32768
- * clock, which introduces a small error.
  *
  * @author Cory Sharp <cssharp@eecs.berkeley.edu>
  * @author Jan Hauer <hauer@tkn.tu-berlin.de>
@@ -39,11 +36,12 @@ generic configuration Alarm62500hz32VirtualizedC()
 }
 implementation
 {
-#warning "Warning: MAC timing is not standard compliant (the symbol clock is based on the 32768 Hz oscillator)!"
-  components new Alarm32khzTo62500hzTransformC();
-  components Alarm32khz32VirtualizedP;
+  components Alarm32khzTo62500hzTransformC, Alarm32khz32VirtualizedP;
+  enum {
+    CLIENT_ID = unique(UQ_ALARM_32KHZ32),
+  };
   
-  Alarm = Alarm32khzTo62500hzTransformC;
-  Alarm32khzTo62500hzTransformC.AlarmFrom -> Alarm32khz32VirtualizedP.Alarm[unique(UQ_ALARM_32KHZ32)];
+  Alarm = Alarm32khzTo62500hzTransformC.Alarm[CLIENT_ID];
+  Alarm32khzTo62500hzTransformC.AlarmFrom[CLIENT_ID] -> Alarm32khz32VirtualizedP.Alarm[CLIENT_ID];
 }