summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2012-07-16 15:24:21 -0700
committerKeith Packard <keithp@keithp.com>2012-07-16 15:24:21 -0700
commit90507d4f7ef77b0870a032b1d9809898c2924721 (patch)
treeeb81d3868b3cfab198fb338bf1918e6dfc0843df
parent184e2ff4790974733df57facdeeb96bfe692ab54 (diff)
altos: Make ao_tick_count visible
Necessary to fetch it when interrupts are already disabled as we can't call ao_time then. Signed-off-by: Keith Packard <keithp@keithp.com>
-rw-r--r--src/avr/ao_timer.c2
-rw-r--r--src/cc1111/ao_timer.c2
-rw-r--r--src/core/ao.h2
-rw-r--r--src/stm/ao_timer.c2
4 files changed, 5 insertions, 3 deletions
diff --git a/src/avr/ao_timer.c b/src/avr/ao_timer.c
index eef14345..cd81b163 100644
--- a/src/avr/ao_timer.c
+++ b/src/avr/ao_timer.c
@@ -17,7 +17,7 @@
#include "ao.h"
-static volatile __data uint16_t ao_tick_count;
+volatile __data uint16_t ao_tick_count;
uint16_t ao_time(void)
{
diff --git a/src/cc1111/ao_timer.c b/src/cc1111/ao_timer.c
index aadee71e..602f98c8 100644
--- a/src/cc1111/ao_timer.c
+++ b/src/cc1111/ao_timer.c
@@ -17,7 +17,7 @@
#include "ao.h"
-static volatile __data uint16_t ao_tick_count;
+volatile __data uint16_t ao_tick_count;
uint16_t ao_time(void) __critical
{
diff --git a/src/core/ao.h b/src/core/ao.h
index d4be3be4..65b9eb18 100644
--- a/src/core/ao.h
+++ b/src/core/ao.h
@@ -125,6 +125,8 @@ ao_panic(uint8_t reason);
* ao_timer.c
*/
+extern volatile __data uint16_t ao_tick_count;
+
/* Our timer runs at 100Hz */
#define AO_HERTZ 100
#define AO_MS_TO_TICKS(ms) ((ms) / (1000 / AO_HERTZ))
diff --git a/src/stm/ao_timer.c b/src/stm/ao_timer.c
index 936dc881..ebe75366 100644
--- a/src/stm/ao_timer.c
+++ b/src/stm/ao_timer.c
@@ -17,7 +17,7 @@
#include "ao.h"
-static volatile __data uint16_t ao_tick_count;
+volatile __data uint16_t ao_tick_count;
uint16_t ao_time(void)
{