This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit e659ae83b0cc3a96fb556553b6369c556d7a28e1
Author: David Sidrane <david.sidr...@nscdg.com>
AuthorDate: Tue Jun 29 15:13:35 2021 -0700
Kinetis:Serial No DMA Poll needed
---
arch/arm/src/kinetis/kinetis_serial.c | 84 ++++++++---------------------------
arch/arm/src/kinetis/kinetis_uart.h | 46 -------------------
2 files changed, 19 insertions(+), 111 deletions(-)
diff --git a/arch/arm/src/kinetis/kinetis_serial.c
b/arch/arm/src/kinetis/kinetis_serial.c
index 88c07b9..3047b1f 100644
--- a/arch/arm/src/kinetis/kinetis_serial.c
+++ b/arch/arm/src/kinetis/kinetis_serial.c
@@ -1038,7 +1038,6 @@ static void up_dma_shutdown(struct uart_dev_s *dev)
kinetis_dmach_free(rxdma);
priv->rxdma = NULL;
-
}
#endif
@@ -1253,6 +1252,22 @@ static int up_interrupts(int irq, void *context, FAR
void *arg)
uart_xmitchars(dev);
handled = true;
}
+
+#if defined(SERIAL_HAVE_DMA) && !defined(CONFIG_KINETIS_UARTFIFOS)
+ /* Check if the receiver has detected IDLE. If so
+ * then flush any partail data in the SW rx fifo.
+ */
+
+ if ((s1 & UART_S1_IDLE) != 0)
+ {
+ up_serialin(priv, KINETIS_UART_D_OFFSET);
+ up_dma_rxcallback(priv->rxdma, dev , false, 0);
+
+ /* Exit ASAP */
+
+ handled = false;
+ }
+#endif
}
return OK;
@@ -1674,6 +1689,9 @@ static void up_rxint(struct uart_dev_s *dev, bool enable)
#ifndef CONFIG_SUPPRESS_SERIAL_INTS
priv->ie |= UART_C2_RIE;
+#if defined(SERIAL_HAVE_DMA) && !defined(CONFIG_KINETIS_UARTFIFOS)
+ priv->ie |= UART_C2_RIE | UART_C2_ILIE;
+#endif
up_setuartint(priv);
#endif
}
@@ -2070,70 +2088,6 @@ unsigned int kinetis_uart_serialinit(unsigned int first)
}
/****************************************************************************
- * Name: kinetis_serial_dma_poll
- *
- * Description:
- * Checks receive DMA buffers for received bytes that have not accumulated
- * to the point where the DMA half/full interrupt has triggered.
- *
- * This function should be called from a timer or other periodic context.
- *
- ****************************************************************************/
-
-#ifdef SERIAL_HAVE_DMA
-void kinetis_serial_dma_poll(void)
-{
- irqstate_t flags;
-
- flags = enter_critical_section();
-
-#ifdef CONFIG_KINETIS_UART0_RXDMA
- if (g_uart0priv.rxdma != NULL)
- {
- up_dma_rxcallback(g_uart0priv.rxdma, (void *)&g_uart0port, false, 0);
- }
-#endif
-
-#ifdef CONFIG_KINETIS_UART1_RXDMA
- if (g_uart1priv.rxdma != NULL)
- {
- up_dma_rxcallback(g_uart1priv.rxdma, (void *)&g_uart1port, false, 0);
- }
-#endif
-
-#ifdef CONFIG_KINETIS_UART2_RXDMA
- if (g_uart2priv.rxdma != NULL)
- {
- up_dma_rxcallback(g_uart2priv.rxdma, (void *)&g_uart2port, false, 0);
- }
-#endif
-
-#ifdef CONFIG_KINETIS_UART3_RXDMA
- if (g_uart3priv.rxdma != NULL)
- {
- up_dma_rxcallback(g_uart3priv.rxdma, (void *)&g_uart3port, false, 0);
- }
-#endif
-
-#ifdef CONFIG_KINETIS_UART4_RXDMA
- if (g_uart4priv.rxdma != NULL)
- {
- up_dma_rxcallback(g_uart4priv.rxdma, (void *)&g_uart4port, false, 0);
- }
-#endif
-
-#ifdef CONFIG_KINETIS_UART5_RXDMA
- if (g_uart5priv.rxdma != NULL)
- {
- up_dma_rxcallback(g_uart5priv.rxdma, (void *)&g_uart5port, false, 0);
- }
-#endif
-
- leave_critical_section(flags);
-}
-#endif
-
-/****************************************************************************
* Name: up_putc
*
* Description:
diff --git a/arch/arm/src/kinetis/kinetis_uart.h
b/arch/arm/src/kinetis/kinetis_uart.h
index f4d396b..39b9aa9 100644
--- a/arch/arm/src/kinetis/kinetis_uart.h
+++ b/arch/arm/src/kinetis/kinetis_uart.h
@@ -52,51 +52,5 @@
# endif
#endif
-/****************************************************************************
- * Public Types
- ****************************************************************************/
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-#ifndef __ASSEMBLY__
-
-#undef EXTERN
-#if defined(__cplusplus)
-#define EXTERN extern "C"
-extern "C"
-{
-#else
-#define EXTERN extern
-#endif
-
-/****************************************************************************
- * Public Functions Prototypes
- ****************************************************************************/
-
-/****************************************************************************
- * Name: kinetis_serial_dma_poll
- *
- * Description:
- * Must be called periodically if any Kinetis UART is configured for DMA.
- * The DMA callback is triggered for each fifo size/2 bytes, but this can
- * result in some bytes being transferred but not collected if the incoming
- * data is not a whole multiple of half the FIFO size.
- *
- * May be safely called from either interrupt or thread context.
- *
- ****************************************************************************/
-
-#ifdef SERIAL_HAVE_DMA
-void kinetis_serial_dma_poll(void);
-#endif
-
-#undef EXTERN
-#if defined(__cplusplus)
-}
-#endif
-
-#endif /* __ASSEMBLY__ */
#endif /* HAVE_UART_DEVICE && USE_SERIALDRIVER) */
#endif /* __ARCH_ARM_SRC_KINETIS_KINETIS_UART_H */
