#include "ao.h"
-volatile __data uint16_t ao_time;
+static volatile __data uint16_t ao_tick_count;
-void ao_timer_isr(void) interrupt 9
+uint16_t ao_time(void)
{
- ++ao_time;
- ao_wakeup(DATA_TO_XDATA(&ao_time));
+ uint16_t ret;
+ __critical {
+ ret = ao_tick_count;
+ }
+ return ret;
}
-uint16_t ao_time_atomic(void)
+void
+ao_delay(uint16_t ticks)
{
- uint8_t ret1;
- uint16_t ret2;
-
- for (;;) {
- ret1 = ao_time >> 8;
- ret2 = ao_time;
- if (ret1 == ((__xdata uint8_t *)(&ret2))[1])
- break;
- }
- return ret2;
+ uint16_t until = ao_time() + ticks;
+
+ while ((int16_t) (until - ao_time()) > 0)
+ ao_sleep(DATA_TO_XDATA(&ao_tick_count));
}
#define T1_CLOCK_DIVISOR 8 /* 24e6/8 = 3e6 */
#define T1_SAMPLE_TIME 30000 /* 3e6/30000 = 100 */
+volatile __data uint8_t ao_adc_interval = 1;
+volatile __data uint8_t ao_adc_count;
+
+void ao_timer_isr(void) interrupt 9
+{
+ ++ao_tick_count;
+ if (++ao_adc_count >= ao_adc_interval) {
+ ao_adc_count = 0;
+ ao_adc_poll();
+ }
+ ao_wakeup(DATA_TO_XDATA(&ao_tick_count));
+}
+
+void
+ao_timer_set_adc_interval(uint8_t interval) __critical
+{
+ ao_adc_interval = interval;
+}
+
void
ao_timer_init(void)
{
/* set the sample rate */
T1CC0H = T1_SAMPLE_TIME >> 8;
- T1CC0L = T1_SAMPLE_TIME;
+ T1CC0L = (uint8_t) T1_SAMPLE_TIME;
T1CCTL0 = T1CCTL_MODE_COMPARE;
T1CCTL1 = 0;
T1CTL = T1CTL_MODE_MODULO | T1CTL_DIV_8;
}
-void
-ao_delay(uint16_t ticks)
-{
- uint16_t until = ao_time_atomic() + ticks;
-
- while ((int16_t) (until - ao_time_atomic()) > 0)
- ao_sleep(DATA_TO_XDATA(&ao_time));
-}