Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ADC: switch to SREG = oldSREG pattern for interrupt mask/restore

This commit is contained in:
Andrew Tridgell 2012-11-20 22:30:03 +11:00
parent 27e3f0c091
commit 0c8cef5714
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libraries/AP_ADC/AP_ADC_ADS7844.cpp
View File

@ -179,12 +179,14 @@ float AP_ADC_ADS7844::Ch(uint8_t ch_num)
while (_count[ch_num] == 0) /* noop */; while (_count[ch_num] == 0) /* noop */;
// grab the value with interrupts disabled, and clear the count // grab the value with interrupts disabled, and clear the count
uint8_t oldSREG = SREG;
cli(); cli();
count = _count[ch_num]; count = _count[ch_num];
sum = _sum[ch_num]; sum = _sum[ch_num];
_count[ch_num] = 0; _count[ch_num] = 0;
_sum[ch_num] = 0; _sum[ch_num] = 0;
sei();
SREG = oldSREG;
return ((float)sum)/count; return ((float)sum)/count;
} }
@ -220,6 +222,7 @@ uint32_t AP_ADC_ADS7844::Ch6(const uint8_t *channel_numbers, float *result)
} }
// grab the values with interrupts disabled, and clear the counts // grab the values with interrupts disabled, and clear the counts
uint8_t oldSREG = SREG;
cli(); cli();
for (i=0; i<6; i++) { for (i=0; i<6; i++) {
count[i] = _count[channel_numbers[i]]; count[i] = _count[channel_numbers[i]];
@ -233,7 +236,7 @@ uint32_t AP_ADC_ADS7844::Ch6(const uint8_t *channel_numbers, float *result)
uint32_t ret = _ch6_last_sample_time_micros - _ch6_delta_time_start_micros; uint32_t ret = _ch6_last_sample_time_micros - _ch6_delta_time_start_micros;
_ch6_delta_time_start_micros = _ch6_last_sample_time_micros; _ch6_delta_time_start_micros = _ch6_last_sample_time_micros;
sei(); SREG = oldSREG;
// calculate averages. We keep this out of the cli region // calculate averages. We keep this out of the cli region
// to prevent us stalling the ISR while doing the // to prevent us stalling the ISR while doing the