From f098e079d0fd66419adbb226d7045ca810fe9890 Mon Sep 17 00:00:00 2001
From: Giovanni Di Sirio <gdisirio@gmail.com>
Date: Fri, 13 Nov 2015 12:33:18 +0000
Subject: Improved UART driver.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8479 35acf78f-673a-0410-8e92-d51de3d6d3f4
---
 os/hal/ports/STM32/LLD/USARTv2/uart_lld.c | 35 +++++++------------------------
 1 file changed, 8 insertions(+), 27 deletions(-)

(limited to 'os/hal/ports/STM32/LLD/USARTv2/uart_lld.c')

diff --git a/os/hal/ports/STM32/LLD/USARTv2/uart_lld.c b/os/hal/ports/STM32/LLD/USARTv2/uart_lld.c
index 59bb6c229..7594669f0 100644
--- a/os/hal/ports/STM32/LLD/USARTv2/uart_lld.c
+++ b/os/hal/ports/STM32/LLD/USARTv2/uart_lld.c
@@ -179,7 +179,7 @@ static uartflags_t translate_errors(uint32_t isr) {
  *
  * @param[in] uartp     pointer to the @p UARTDriver object
  */
-static void set_rx_idle_loop(UARTDriver *uartp) {
+static void uart_enter_rx_idle_loop(UARTDriver *uartp) {
   uint32_t mode;
   
   /* RX DMA channel preparation, if the char callback is defined then the
@@ -243,7 +243,7 @@ static void usart_start(UARTDriver *uartp) {
   u->CR1 = uartp->config->cr1 | cr1;
 
   /* Starting the receiver idle loop.*/
-  set_rx_idle_loop(uartp);
+  uart_enter_rx_idle_loop(uartp);
 }
 
 /**
@@ -266,23 +266,13 @@ static void uart_lld_serve_rx_end_irq(UARTDriver *uartp, uint32_t flags) {
   if (uartp->rxstate == UART_RX_IDLE) {
     /* Receiver in idle state, a callback is generated, if enabled, for each
        received character and then the driver stays in the same state.*/
-    if (uartp->config->rxchar_cb != NULL)
-      uartp->config->rxchar_cb(uartp, uartp->rxbuf);
+    _uart_rx_idle_code(uartp);
   }
   else {
     /* Receiver in active state, a callback is generated, if enabled, after
        a completed transfer.*/
     dmaStreamDisable(uartp->dmarx);
-    uartp->rxstate = UART_RX_COMPLETE;
-    if (uartp->config->rxend_cb != NULL)
-      uartp->config->rxend_cb(uartp);
-
-    /* If the callback didn't explicitly change state then the receiver
-       automatically returns to the idle state.*/
-    if (uartp->rxstate == UART_RX_COMPLETE) {
-      uartp->rxstate = UART_RX_IDLE;
-      set_rx_idle_loop(uartp);
-    }
+    _uart_rx_complete_isr_code(uartp);
   }
 }
 
@@ -306,14 +296,7 @@ static void uart_lld_serve_tx_end_irq(UARTDriver *uartp, uint32_t flags) {
   dmaStreamDisable(uartp->dmatx);
 
   /* A callback is generated, if enabled, after a completed transfer.*/
-  uartp->txstate = UART_TX_COMPLETE;
-  if (uartp->config->txend1_cb != NULL)
-    uartp->config->txend1_cb(uartp);
-
-  /* If the callback didn't explicitly change state then the transmitter
-     automatically returns to the idle state.*/
-  if (uartp->txstate == UART_TX_COMPLETE)
-    uartp->txstate = UART_TX_IDLE;
+  _uart_wakeup_tx1_isr(uartp);
 }
 
 /**
@@ -332,8 +315,7 @@ static void serve_usart_irq(UARTDriver *uartp) {
 
   if (isr & (USART_ISR_LBDF | USART_ISR_ORE | USART_ISR_NE |
              USART_ISR_FE   | USART_ISR_PE)) {
-    if (uartp->config->rxerr_cb != NULL)
-      uartp->config->rxerr_cb(uartp, translate_errors(isr));
+    _uart_rx_error_isr_code(uartp, translate_errors(isr));
   }
 
   if ((isr & USART_ISR_TC) && (cr1 & USART_CR1_TCIE)) {
@@ -341,8 +323,7 @@ static void serve_usart_irq(UARTDriver *uartp) {
     u->CR1 = cr1 & ~USART_CR1_TCIE;
 
     /* End of transmission, a callback is generated.*/
-    if (uartp->config->txend2_cb != NULL)
-      uartp->config->txend2_cb(uartp);
+    _uart_wakeup_tx2_isr(uartp);
   }
 }
 
@@ -940,7 +921,7 @@ size_t uart_lld_stop_receive(UARTDriver *uartp) {
 
   dmaStreamDisable(uartp->dmarx);
   n = dmaStreamGetTransactionSize(uartp->dmarx);
-  set_rx_idle_loop(uartp);
+  uart_enter_rx_idle_loop(uartp);
 
   return n;
 }
-- 
cgit v1.2.3