jacob.eva/arduino-esp32
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix UART FIFO test for being full (#5390)

Browse Source 
Fixes #5362
This commit is contained in:
Rodrigo Garcia 2021-07-15 21:21:49 -03:00 committed by GitHub
parent f4f1c8956b
commit 676f5cfe30
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cores/esp32/esp32-hal-uart.c
View File

@ -422,7 +422,7 @@ void uartWrite(uart_t* uart, uint8_t c)
return; return;
} }
UART_MUTEX_LOCK(); UART_MUTEX_LOCK();
while(uart->dev->status.txfifo_cnt == 0x7F); while(uart->dev->status.txfifo_cnt >= 0x7E);
#if CONFIG_IDF_TARGET_ESP32 #if CONFIG_IDF_TARGET_ESP32
uart->dev->fifo.rw_byte = c; uart->dev->fifo.rw_byte = c;
#else #else
@ -441,7 +441,7 @@ void uartWriteBuf(uart_t* uart, const uint8_t * data, size_t len)
uint32_t fifo_reg = UART_FIFO_AHB_REG(uart->num); uint32_t fifo_reg = UART_FIFO_AHB_REG(uart->num);
#endif #endif
while(len) { while(len) {
while(uart->dev->status.txfifo_cnt == 0x7F); while(uart->dev->status.txfifo_cnt >= 0x7E);
#if CONFIG_IDF_TARGET_ESP32 #if CONFIG_IDF_TARGET_ESP32
uart->dev->fifo.rw_byte = *data++; uart->dev->fifo.rw_byte = *data++;
#else #else
@ -563,7 +563,7 @@ uint32_t uartGetBaudRate(uart_t* uart)
static void ARDUINO_ISR_ATTR uart0_write_char(char c) static void ARDUINO_ISR_ATTR uart0_write_char(char c)
{ {
#if CONFIG_IDF_TARGET_ESP32 #if CONFIG_IDF_TARGET_ESP32
while(((ESP_REG(0x01C+DR_REG_UART_BASE) >> UART_TXFIFO_CNT_S) & 0x7F) == 0x7F); while(((ESP_REG(0x01C+DR_REG_UART_BASE) >> UART_TXFIFO_CNT_S) & 0x7F) >= 0x7E);
ESP_REG(DR_REG_UART_BASE) = c; ESP_REG(DR_REG_UART_BASE) = c;
#else #else
while(UART0.status.txfifo_cnt == 0x7F); while(UART0.status.txfifo_cnt == 0x7F);
@ -574,7 +574,7 @@ static void ARDUINO_ISR_ATTR uart0_write_char(char c)
static void ARDUINO_ISR_ATTR uart1_write_char(char c) static void ARDUINO_ISR_ATTR uart1_write_char(char c)
{ {
#if CONFIG_IDF_TARGET_ESP32 #if CONFIG_IDF_TARGET_ESP32
while(((ESP_REG(0x01C+DR_REG_UART1_BASE) >> UART_TXFIFO_CNT_S) & 0x7F) == 0x7F); while(((ESP_REG(0x01C+DR_REG_UART1_BASE) >> UART_TXFIFO_CNT_S) & 0x7F) >= 0x7E);
ESP_REG(DR_REG_UART1_BASE) = c; ESP_REG(DR_REG_UART1_BASE) = c;
#else #else
while(UART1.status.txfifo_cnt == 0x7F); while(UART1.status.txfifo_cnt == 0x7F);
@ -585,7 +585,7 @@ static void ARDUINO_ISR_ATTR uart1_write_char(char c)
#if CONFIG_IDF_TARGET_ESP32 #if CONFIG_IDF_TARGET_ESP32
static void ARDUINO_ISR_ATTR uart2_write_char(char c) static void ARDUINO_ISR_ATTR uart2_write_char(char c)
{ {
while(((ESP_REG(0x01C+DR_REG_UART2_BASE) >> UART_TXFIFO_CNT_S) & 0x7F) == 0x7F); while(((ESP_REG(0x01C+DR_REG_UART2_BASE) >> UART_TXFIFO_CNT_S) & 0x7F) >= 0x7E);
ESP_REG(DR_REG_UART2_BASE) = c; ESP_REG(DR_REG_UART2_BASE) = c;
} }
#endif #endif