X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fao_timer.c;h=d1731475c226eee9992ae00315c333b1877f2285;hp=78c6e063f0991eb5c71e628b652cca08e928c02b;hb=004c2a9b7a4b44ef71ca60482573e8e9d8c6ce93;hpb=e59520e343c2573b1b92c0b3c4aaa93e51bc55d3

diff --git a/src/ao_timer.c b/src/ao_timer.c
index 78c6e063..d1731475 100644
--- a/src/ao_timer.c
+++ b/src/ao_timer.c
@@ -24,37 +24,42 @@ uint16_t ao_time(void) __critical
 	return ao_tick_count;
 }
 
+static __xdata uint8_t ao_forever;
+
 void
 ao_delay(uint16_t ticks)
 {
-	uint16_t until = ao_time() + ticks;
-
-	while ((int16_t) (until - ao_time()) > 0)
-		ao_sleep(DATA_TO_XDATA(&ao_tick_count));
+	ao_alarm(ticks);
+	ao_sleep(&ao_forever);
 }
 
 #define T1_CLOCK_DIVISOR	8	/* 24e6/8 = 3e6 */
 #define T1_SAMPLE_TIME		30000	/* 3e6/30000 = 100 */
 
+#if HAS_ADC
 volatile __data uint8_t	ao_adc_interval = 1;
 volatile __data uint8_t	ao_adc_count;
+#endif
 
 void ao_timer_isr(void) interrupt 9
 {
 	++ao_tick_count;
+#if HAS_ADC
 	if (++ao_adc_count == ao_adc_interval) {
 		ao_adc_count = 0;
 		ao_adc_poll();
 	}
-	ao_wakeup(DATA_TO_XDATA(&ao_tick_count));
+#endif
 }
 
+#if HAS_ADC
 void
 ao_timer_set_adc_interval(uint8_t interval) __critical
 {
 	ao_adc_interval = interval;
 	ao_adc_count = 0;
 }
+#endif
 
 void
 ao_timer_init(void)