Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

[fw/altos] / src / avr / ao_timer.c

diff --git a/src/avr/ao_timer.c b/src/avr/ao_timer.c
index eef14345dda7d5bf96a09881c61c6b27915c4975..ff6a829afde0fca9887b8f3e6facfcc98a6769dd 100644 (file)
--- a/src/avr/ao_timer.c
+++ b/src/avr/ao_timer.c
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,7 +18,7 @@
 
 #include "ao.h"
 
-static volatile __data uint16_t ao_tick_count;
+volatile uint16_t ao_tick_count;
 
 uint16_t ao_time(void)
 {
@@ -28,21 +29,12 @@ uint16_t ao_time(void)
        return v;
 }
 
-static __xdata uint8_t ao_forever;
-
-void
-ao_delay(uint16_t ticks)
-{
-       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;
+volatile uint8_t       ao_adc_interval = 1;
+volatile uint8_t       ao_adc_count;
 #endif
 
 void
@@ -61,7 +53,7 @@ ISR(TIMER1_COMPA_vect)
 
 #if HAS_ADC
 void
-ao_timer_set_adc_interval(uint8_t interval) __critical
+ao_timer_set_adc_interval(uint8_t interval) 
 {
        ao_adc_interval = interval;
        ao_adc_count = 0;