sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

xtensa/esp32: Fixes termios issue.

Browse Source
This commit is contained in:
Sara Souza 2021-07-05 15:04:30 -03:00 committed by Xiang Xiao
parent f230ba7b34
commit 2abeba041d
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
arch/xtensa/src/esp32/esp32_serial.c
View File

@ -857,7 +857,7 @@ static int esp32_setup(struct uart_dev_s *dev)
/* Set up the CONF0 register. */ /* Set up the CONF0 register. */
conf0 = UART_TICK_REF_ALWAYS_ON; conf0 = UART_TICK_REF_ALWAYS_ON | UART_ERR_WR_MASK_M;
#ifdef CONFIG_SERIAL_OFLOWCONTROL #ifdef CONFIG_SERIAL_OFLOWCONTROL
/* Check if output flow control is enabled for this UART controller. */ /* Check if output flow control is enabled for this UART controller. */
@ -920,14 +920,6 @@ static int esp32_setup(struct uart_dev_s *dev)
regval |= (clkdiv & 15) << UART_CLKDIV_FRAG_S; regval |= (clkdiv & 15) << UART_CLKDIV_FRAG_S;
putreg32(regval, UART_CLKDIV_REG(priv->config->id)); putreg32(regval, UART_CLKDIV_REG(priv->config->id));
/* Enable RX and error interrupts. Clear and pending interrtupt */
regval = UART_RXFIFO_FULL_INT_ENA | UART_FRM_ERR_INT_ENA |
UART_RXFIFO_TOUT_INT_ENA;
putreg32(regval, UART_INT_ENA_REG(priv->config->id));
putreg32(UINT32_MAX, UART_INT_CLR_REG(priv->config->id));
/* Reset the RX and TX FIFO */ /* Reset the RX and TX FIFO */
esp32_reset_rx_fifo(priv); esp32_reset_rx_fifo(priv);
@ -940,6 +932,14 @@ static int esp32_setup(struct uart_dev_s *dev)
UART_RX_TOUT_EN; UART_RX_TOUT_EN;
putreg32(regval, UART_CONF1_REG(priv->config->id)); putreg32(regval, UART_CONF1_REG(priv->config->id));
/* Enable RX and error interrupts. Clear and pending interrtupt */
regval = UART_RXFIFO_FULL_INT_ENA | UART_FRM_ERR_INT_ENA |
UART_RXFIFO_TOUT_INT_ENA;
putreg32(regval, UART_INT_ENA_REG(priv->config->id));
putreg32(UINT32_MAX, UART_INT_CLR_REG(priv->config->id));
#ifdef CONFIG_SERIAL_IFLOWCONTROL #ifdef CONFIG_SERIAL_IFLOWCONTROL
/* Check if input flow control is enabled for this UART controller */ /* Check if input flow control is enabled for this UART controller */
@ -988,13 +988,6 @@ static void esp32_shutdown(struct uart_dev_s *dev)
/* Disable all UART interrupts */ /* Disable all UART interrupts */
esp32_disableallints(priv, NULL); esp32_disableallints(priv, NULL);
/* Unconfigure and disable the UART */
putreg32(0, UART_CONF0_REG(priv->config->id));
putreg32(0, UART_CONF1_REG(priv->config->id));
putreg32(0, UART_INT_ENA_REG(priv->config->id));
putreg32(UINT32_MAX, UART_INT_CLR_REG(priv->config->id)); putreg32(UINT32_MAX, UART_INT_CLR_REG(priv->config->id));
} }