HAL_AVR: fixed attach_interrupt race condition

This commit is contained in:
Andrew Tridgell 2012-12-21 09:09:15 +11:00
parent d54c6989ab
commit 47358929e2

View File

@ -97,9 +97,12 @@ bool AVRGPIO::attach_interrupt(
uint8_t interrupt_num, AP_HAL::Proc proc, uint8_t mode) { uint8_t interrupt_num, AP_HAL::Proc proc, uint8_t mode) {
if (!((mode == 0)||(mode == 1)||(mode==3))) return false; if (!((mode == 0)||(mode == 1)||(mode==3))) return false;
if (interrupt_num == 6) { if (interrupt_num == 6) {
uint8_t oldSREG = SREG;
cli();
_interrupt_6 = proc; _interrupt_6 = proc;
EICRB = (EICRB & ~((1 << ISC60) | (1 << ISC61))) | (mode << ISC60); EICRB = (EICRB & ~((1 << ISC60) | (1 << ISC61))) | (mode << ISC60);
EIMSK |= (1 << INT6); EIMSK |= (1 << INT6);
SREG = oldSREG;
return true; return true;
} else { } else {
return false; return false;