X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=tos%2Fplatforms%2Ftelosb%2Fmac%2Ftkn154%2Ftimer%2FAlarm32khzTo62500hzTransformC.nc;h=20f0822d49e1d7863038d7f834e28b9ad3770734;hb=dc0f696e45f67b0aed906ab6449faeb3d52380d9;hp=c51d1122b316d3e0f634bf8d65019db3a5971687;hpb=0c93ead951bb9666631e78a7f7ebc06cd364a171;p=tinyos-2.x.git

diff --git a/tos/platforms/telosb/mac/tkn154/timer/Alarm32khzTo62500hzTransformC.nc b/tos/platforms/telosb/mac/tkn154/timer/Alarm32khzTo62500hzTransformC.nc
index c51d1122..20f0822d 100644
--- a/tos/platforms/telosb/mac/tkn154/timer/Alarm32khzTo62500hzTransformC.nc
+++ b/tos/platforms/telosb/mac/tkn154/timer/Alarm32khzTo62500hzTransformC.nc
@@ -1,17 +1,84 @@
-// here we introduce an error
-generic module Alarm32khzTo62500hzTransformC()
+/*
+ * Copyright (c) 2008, Technische Universitaet Berlin
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions 
+ * are met:
+ * - Redistributions of source code must retain the above copyright notice,
+ *   this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright 
+ *   notice, this list of conditions and the following disclaimer in the 
+ *   documentation and/or other materials provided with the distribution.
+ * - Neither the name of the Technische Universitaet Berlin nor the names 
+ *   of its contributors may be used to endorse or promote products derived
+ *   from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED 
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, 
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE 
+ * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * - Revision -------------------------------------------------------------
+ * $Date$
+ * @author Jan Hauer <hauer@tkn.tu-berlin.de>
+ * ========================================================================
+ */
+
+module Alarm32khzTo62500hzTransformC
+
 {
-  provides interface Alarm<T62500hz,uint32_t> as Alarm;
-  uses interface Alarm<T32khz,uint32_t> as AlarmFrom;
+  provides interface Alarm<T62500hz,uint32_t> as Alarm[ uint8_t num ];
+  uses interface Alarm<T32khz,uint32_t> as AlarmFrom[ uint8_t num ];
 }
 implementation
 {
-  async command void Alarm.start(uint32_t dt){ call AlarmFrom.start(dt >> 1);}
-  async command void Alarm.stop(){ call AlarmFrom.stop();}
-  async event void AlarmFrom.fired(){ signal Alarm.fired();}
-  async command bool Alarm.isRunning(){ return call AlarmFrom.isRunning();}
-  async command void Alarm.startAt(uint32_t t0, uint32_t dt){ call AlarmFrom.startAt(t0 >> 1, dt >> 1);}
-  async command uint32_t Alarm.getNow(){ return call AlarmFrom.getNow() << 1;}
-  async command uint32_t Alarm.getAlarm(){ return call AlarmFrom.getAlarm() << 1;}
-  default async event void Alarm.fired(){}
+/**
+ * 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 (5%) error.
+*/
+#warning "Warning: MAC timing is not standard compliant (the symbol clock is based on the 32768 Hz oscillator)!"
+
+  async command void Alarm.start[ uint8_t num ](uint32_t dt){ call AlarmFrom.start[num](dt >> 1);}
+  async command void Alarm.stop[ uint8_t num ](){ call AlarmFrom.stop[num]();}
+  async event void AlarmFrom.fired[ uint8_t num ](){ signal Alarm.fired[num]();}
+  async command bool Alarm.isRunning[ uint8_t num ](){ return call AlarmFrom.isRunning[num]();}
+  async command uint32_t Alarm.getAlarm[ uint8_t num ](){ return call AlarmFrom.getAlarm[num]() << 1;}
+
+  async command uint32_t Alarm.getNow[ uint8_t num ](){ 
+    // this might shift out the most significant bit
+    // that's why Alarm.startAt() is converted to a Alarm.start()
+    return call AlarmFrom.getNow[num]() << 1; 
+  }
+
+  async command void Alarm.startAt[ uint8_t num ](uint32_t t0, uint32_t dt){
+    // t0 occured before "now"
+    uint32_t now = call Alarm.getNow[num](), elapsed;
+    if (t0 <= now)
+      elapsed = now - t0;
+    else
+      elapsed = ~(t0 - now) + 1;
+    if (elapsed > dt)
+      elapsed = dt;
+    dt -= elapsed;
+    call AlarmFrom.start[num](dt >> 1);
+  }
+
+  /******************** Defaults ****************************/
+
+  default async command void AlarmFrom.start[ uint8_t num ](uint32_t dt){ }
+  default async command void AlarmFrom.stop[ uint8_t num ](){ }
+  default async command bool AlarmFrom.isRunning[ uint8_t num ](){ return FALSE;}
+  default async event void Alarm.fired[ uint8_t num ](){}
+  default async command void AlarmFrom.startAt[ uint8_t num ](uint32_t t0, uint32_t dt){ }
+  default async command uint32_t AlarmFrom.getNow[ uint8_t num ](){ return 0;}
+  default async command uint32_t AlarmFrom.getAlarm[ uint8_t num ](){ return 0;}
 }