feedc0de/arduino-esp32
1
0
Fork 0
forked from espressif/arduino-esp32
Code Pull Requests Activity

Fix Serial

Browse Source
This commit is contained in:
me-no-dev
2020-05-14 02:57:52 +03:00
parent 4b9f70236f
commit 61132a7172
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -76,10 +76,10 @@ struct uart_struct_t {
#define UART_MUTEX_UNLOCK() #define UART_MUTEX_UNLOCK()
static uart_t _uart_bus_array[] = { static uart_t _uart_bus_array[] = {
{(volatile uart_dev_t *)(DR_REG_UART_BASE), 0, NULL, NULL}, {&UART0, 0, NULL, NULL},
{(volatile uart_dev_t *)(DR_REG_UART1_BASE), 1, NULL, NULL}, {&UART1, 1, NULL, NULL},
#if CONFIG_IDF_TARGET_ESP32 #if CONFIG_IDF_TARGET_ESP32
{(volatile uart_dev_t *)(DR_REG_UART2_BASE), 2, NULL, NULL} {&UART2, 2, NULL, NULL}
#endif #endif
}; };
#else #else
@ -87,10 +87,10 @@ static uart_t _uart_bus_array[] = {
#define UART_MUTEX_UNLOCK() xSemaphoreGive(uart->lock) #define UART_MUTEX_UNLOCK() xSemaphoreGive(uart->lock)
static uart_t _uart_bus_array[] = { static uart_t _uart_bus_array[] = {
{(volatile uart_dev_t *)(DR_REG_UART_BASE), NULL, 0, NULL, NULL}, {&UART0, NULL, 0, NULL, NULL},
{(volatile uart_dev_t *)(DR_REG_UART1_BASE), NULL, 1, NULL, NULL}, {&UART1, NULL, 1, NULL, NULL},
#if CONFIG_IDF_TARGET_ESP32 #if CONFIG_IDF_TARGET_ESP32
{(volatile uart_dev_t *)(DR_REG_UART2_BASE), NULL, 2, NULL, NULL} {&UART2, NULL, 2, NULL, NULL}
#endif #endif
}; };
#endif #endif
@ -116,7 +116,7 @@ static void IRAM_ATTR _uart_isr(void *arg)
c = uart->dev->fifo.rw_byte; c = uart->dev->fifo.rw_byte;
#else #else
while(uart->dev->status.rxfifo_cnt) { while(uart->dev->status.rxfifo_cnt) {
c = uart->dev->ahb_fifo.rw_byte; c = READ_PERI_REG(UART_FIFO_AHB_REG(i));
#endif #endif
if(uart->queue != NULL) { if(uart->queue != NULL) {
xQueueSendFromISR(uart->queue, &c, &xHigherPriorityTaskWoken); xQueueSendFromISR(uart->queue, &c, &xHigherPriorityTaskWoken);