Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'bugfix/uart_wait_idle' into 'master'

Browse source 
uart: fix uart_tx_wait_idle to wait for fifo empty

See merge request idf/esp-idf!3489
This commit is contained in:
Ivan Grokhotkov 2018-10-18 11:25:59 +08:00
commit 18684f53ee
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
components/esp32/include/rom/uart.h
View file

@ -267,9 +267,11 @@ void uart_tx_flush(uint8_t uart_no);
* here for compatibility. * here for compatibility.
*/ */
static inline void IRAM_ATTR uart_tx_wait_idle(uint8_t uart_no) { static inline void IRAM_ATTR uart_tx_wait_idle(uint8_t uart_no) {
while(REG_GET_FIELD(UART_STATUS_REG(uart_no), UART_ST_UTX_OUT)) { uint32_t status;
; do {
} status = READ_PERI_REG(UART_STATUS_REG(uart_no));
/* either tx count or state is non-zero */
} while ((status & (UART_ST_UTX_OUT_M | UART_TXFIFO_CNT_M)) != 0);
} }
/** /**

4
components/esp32/sleep_modes.c
View file

@ -159,7 +159,9 @@ static void IRAM_ATTR suspend_uarts()
{ {
for (int i = 0; i < 3; ++i) { for (int i = 0; i < 3; ++i) {
REG_SET_BIT(UART_FLOW_CONF_REG(i), UART_FORCE_XOFF); REG_SET_BIT(UART_FLOW_CONF_REG(i), UART_FORCE_XOFF);
uart_tx_wait_idle(i); while (REG_GET_FIELD(UART_STATUS_REG(i), UART_ST_UTX_OUT) != 0) {
;
}
} }
} }