arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-04-19 23:22:16 +03:00
Code

Don't trip the WDT if interrupts are disabled during write() or flush().

Browse Source 
Prior to this change, if interrupts were disabled during a call to
HardwareSerial::write() when the circular buffer was full, or
HardwareSerial::flush() when the circular buffer was non-empty,
we would loop forever and trip a watchdog timeout.
This commit is contained in:
Christopher Pascoe 2015-12-29 12:05:15 -05:00
parent c8772cfcd0
commit 4ef0466578
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cores/esp8266/HardwareSerial.cpp
View File

@ -636,6 +636,9 @@ void HardwareSerial::flush() {
if(_tx_buffer->getSize() == 0 && if(_tx_buffer->getSize() == 0 &&
UART_GET_TX_FIFO_ROOM(uart_nr) >= UART_TX_FIFO_SIZE) { UART_GET_TX_FIFO_ROOM(uart_nr) >= UART_TX_FIFO_SIZE) {
break; break;
} else if(il.savedInterruptLevel() > 0) {
_tx_empty_irq();
continue;
} }
} }
yield(); yield();
@ -663,6 +666,9 @@ size_t HardwareSerial::write(uint8_t c) {
break; break;
} else if(_tx_buffer->write(c)) { } else if(_tx_buffer->write(c)) {
break; break;
} else if(il.savedInterruptLevel() > 0) {
_tx_empty_irq();
continue;
} }
} }
yield(); yield();

4
cores/esp8266/interrupts.h
View File

@ -31,6 +31,10 @@ public:
xt_wsr_ps(_state); xt_wsr_ps(_state);
} }
uint32_t savedInterruptLevel() const {
return _state & 0x0f;
}
protected: protected:
uint32_t _state; uint32_t _state;
}; };