diff options
| author | Bdale Garbee <bdale@gag.com> | 2019-01-02 22:23:04 -0700 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2019-01-02 22:23:04 -0700 |
| commit | b340cbf1403a5f5b181a215935f713a50da8e5e4 (patch) | |
| tree | 8c0d2afbe8168c29584e0d568b80353fdf555883 /src/avr/ao_timer.c | |
| parent | 1da4b57545233f2f2afd350bd8aed4ef7bb0c844 (diff) | |
| parent | 95ffec073b0758801df04a77eca0bd2bc6e57e35 (diff) | |
Merge branch 'branch-1.9' into debian
Diffstat (limited to 'src/avr/ao_timer.c')
| -rw-r--r-- | src/avr/ao_timer.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/avr/ao_timer.c b/src/avr/ao_timer.c index 2eaa8b63..ff6a829a 100644 --- a/src/avr/ao_timer.c +++ b/src/avr/ao_timer.c @@ -18,7 +18,7 @@ #include "ao.h" -volatile __data uint16_t ao_tick_count; +volatile uint16_t ao_tick_count; uint16_t ao_time(void) { @@ -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; |