projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ao-tools: move 16/32-bit readers from ao-stmload to lib
[fw/altos]
/
src
/
cc1111
/
ao_timer.c
diff --git
a/src/cc1111/ao_timer.c
b/src/cc1111/ao_timer.c
index aadee71e239e324a8b7644fe70872148e615f5d9..54af9605b59bb997fa75b89508bb45e41f06e8d8 100644
(file)
--- a/
src/cc1111/ao_timer.c
+++ b/
src/cc1111/ao_timer.c
@@
-17,23
+17,13
@@
#include "ao.h"
#include "ao.h"
-
static
volatile __data uint16_t ao_tick_count;
+volatile __data uint16_t ao_tick_count;
uint16_t ao_time(void) __critical
{
return ao_tick_count;
}
uint16_t ao_time(void) __critical
{
return ao_tick_count;
}
-static __xdata uint8_t ao_forever;
-
-void
-ao_delay(uint16_t ticks)
-{
- ao_alarm(ticks);
- ao_sleep(&ao_forever);
- ao_clear_alarm();
-}
-
#define T1_CLOCK_DIVISOR 8 /* 24e6/8 = 3e6 */
#define T1_SAMPLE_TIME 30000 /* 3e6/30000 = 100 */
#define T1_CLOCK_DIVISOR 8 /* 24e6/8 = 3e6 */
#define T1_SAMPLE_TIME 30000 /* 3e6/30000 = 100 */
@@
-49,6
+39,9
@@
void ao_timer_isr(void) __interrupt 9
if (++ao_adc_count == ao_adc_interval) {
ao_adc_count = 0;
ao_adc_poll();
if (++ao_adc_count == ao_adc_interval) {
ao_adc_count = 0;
ao_adc_poll();
+#if (AO_DATA_ALL & ~(AO_DATA_ADC))
+ ao_wakeup(DATA_TO_XDATA(&ao_adc_count));
+#endif
}
#endif
}
}
#endif
}