X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Favr%2Fao_timer.c;h=b9c375d31b535299309d38e752b8dda71aa08255;hb=HEAD;hp=2eaa8b63fc65a4a4472802721d3936438c62bcb4;hpb=1085ec5d57e0ed5d132f2bbdac1a0b6a32c0ab4a;p=fw%2Faltos diff --git a/src/avr/ao_timer.c b/src/avr/ao_timer.c index 2eaa8b63..b9c375d3 100644 --- a/src/avr/ao_timer.c +++ b/src/avr/ao_timer.c @@ -18,9 +18,9 @@ #include "ao.h" -volatile __data uint16_t ao_tick_count; +volatile AO_TICK_TYPE ao_tick_count; -uint16_t ao_time(void) +AO_TICK_TYPE ao_time(void) { uint16_t v; ao_arch_critical( @@ -33,8 +33,8 @@ uint16_t ao_time(void) #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 @@ -53,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;