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

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

This commit is contained in:
Andrew Tridgell 2012-11-20 22:30:08 +11:00
parent c1a02e49a0
commit fc63087cb8
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libraries/AP_AnalogSource/AP_AnalogSource_Arduino.cpp
View File

@ -99,9 +99,10 @@ void AP_AnalogSource_Arduino::init_timer(AP_PeriodicProcess * scheduler)
uint16_t AP_AnalogSource_Arduino::read_raw(void) uint16_t AP_AnalogSource_Arduino::read_raw(void)
{ {
uint16_t ret; uint16_t ret;
uint8_t oldSREG = SREG;
cli(); cli();
ret = pins[_pin_index].output; ret = pins[_pin_index].output;
sei(); SREG = oldSREG;
return ret; return ret;
} }
@ -128,12 +129,13 @@ float AP_AnalogSource_Arduino::read_average(void)
// you call read_average() very frequently // you call read_average() very frequently
while (pins[_pin_index].sum_count == 0) ; while (pins[_pin_index].sum_count == 0) ;
uint8_t oldSREG = SREG;
cli(); cli();
sum = pins[_pin_index].sum; sum = pins[_pin_index].sum;
sum_count = pins[_pin_index].sum_count; sum_count = pins[_pin_index].sum_count;
pins[_pin_index].sum = 0; pins[_pin_index].sum = 0;
pins[_pin_index].sum_count = 0; pins[_pin_index].sum_count = 0;
sei(); SREG = oldSREG;
return sum / (float)sum_count; return sum / (float)sum_count;
} }
@ -191,10 +193,11 @@ void AP_AnalogSource_Arduino::set_pin(uint8_t pin)
{ {
pin = _remap_pin(pin); pin = _remap_pin(pin);
if (pins[_pin_index].pin != pin) { if (pins[_pin_index].pin != pin) {
uint8_t oldSREG = SREG;
cli(); cli();
pins[_pin_index].pin = pin; pins[_pin_index].pin = pin;
pins[_pin_index].sum = 0; pins[_pin_index].sum = 0;
pins[_pin_index].sum_count = 0; pins[_pin_index].sum_count = 0;
sei(); SREG = oldSREG;
} }
} }