]> oss.titaniummirror.com Git - tinyos-2.x.git/commitdiff
fixed capture time upstream
authorsallai <sallai>
Fri, 7 May 2010 04:30:15 +0000 (04:30 +0000)
committersallai <sallai>
Fri, 7 May 2010 04:30:15 +0000 (04:30 +0000)
tos/chips/atm128/timer/HplAtm128Timer1P.nc
tos/chips/atm128/timer/HplAtm128Timer3P.nc
tos/chips/atm1281/timer/HplAtm1281Timer1P.nc
tos/chips/atm1281/timer/HplAtm1281Timer3P.nc

index 6dfcff00ece460335802818820fb75575a5eef5a..f8070cf94d4145aee89deb0c02c357b730fbeb4d 100644 (file)
@@ -205,7 +205,7 @@ implementation
   }
   default async event void Capture.captured(uint16_t time) { }
   AVR_NONATOMIC_HANDLER(SIG_INPUT_CAPTURE1) {
-    signal Capture.captured(call Timer.get());
+    signal Capture.captured(call Capture.get());
   }
   default async event void Timer.overflow() { }
   AVR_NONATOMIC_HANDLER(SIG_OVERFLOW1) {
index 77edfdd70e81d29599375668ab6fc3a7ef13bf7a..d3f9fe7060536a3a2dea9d85a7524d939737d7a0 100644 (file)
@@ -199,7 +199,7 @@ implementation
   }
   default async event void Capture.captured(uint16_t time) { }
   AVR_NONATOMIC_HANDLER(SIG_INPUT_CAPTURE3) {
-    signal Capture.captured(call Timer.get());
+    signal Capture.captured(call Capture.get());
   }
   default async event void Timer.overflow() { }
   AVR_NONATOMIC_HANDLER(SIG_OVERFLOW3) {
index efc4868dc0d7c8d9b341da96255f442e1c8b30c2..0c6e563e55e2a9d76a4c34f8fd853cd5fd577862 100644 (file)
@@ -216,7 +216,7 @@ implementation
   }
   default async event void Capture.captured(uint16_t time) { }
   AVR_NONATOMIC_HANDLER(SIG_INPUT_CAPTURE1) {
-    signal Capture.captured(call Timer.get());
+    signal Capture.captured(call Capture.get());
   }
   default async event void Timer.overflow() { }
   AVR_NONATOMIC_HANDLER(SIG_OVERFLOW1) {
index e0612fefc2db62dd23b0d7aadf6c70a9368bc7b8..e545f5569de563cded9be246a6b57430d5b281f0 100644 (file)
@@ -216,7 +216,7 @@ implementation
   }
   default async event void Capture.captured(uint16_t time) { }
   AVR_NONATOMIC_HANDLER(SIG_INPUT_CAPTURE3) {
-    signal Capture.captured(call Timer.get());
+    signal Capture.captured(call Capture.get());
   }
   default async event void Timer.overflow() { }
   AVR_NONATOMIC_HANDLER(SIG_OVERFLOW3) {