Added support up to STM32 UART8 in v2 drivers.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8155 35acf78f-673a-0410-8e92-d51de3d6d3f4

1 files changed, 104 insertions, 2 deletions

diff --git a/os/hal/ports/STM32/LLD/USARTv2/serial_lld.c b/os/hal/ports/STM32/LLD/USARTv2/serial_lld.c
index bf4ac2cd6..0c459c84e 100644
--- a/os/hal/ports/STM32/LLD/USARTv2/serial_lld.c
+++ b/os/hal/ports/STM32/LLD/USARTv2/serial_lld.c
@@ -69,6 +69,16 @@ SerialDriver SD5;
 SerialDriver SD6;

 #endif

 

+/** @brief UART7 serial driver identifier.*/

+#if STM32_SERIAL_USE_UART7 || defined(__DOXYGEN__)

+SerialDriver SD7;

+#endif

+

+/** @brief UART8 serial driver identifier.*/

+#if STM32_SERIAL_USE_UART8 || defined(__DOXYGEN__)

+SerialDriver SD8;

+#endif

+

 /*===========================================================================*/

 /* Driver local variables and types.                                         */

 /*===========================================================================*/

@@ -97,7 +107,7 @@ static void usart_init(SerialDriver *sdp, const SerialConfig *config) {
   USART_TypeDef *u = sdp->usart;

 

   /* Baud rate setting.*/

-  u->BRR = (uint16_t)(sdp->clock / config->speed);

+  u->BRR = (uint32_t)(sdp->clock / config->speed);

 

   /* Note that some bits are enforced.*/

   u->CR2 = config->cr2 | USART_CR2_LBDIE;

@@ -105,7 +115,7 @@ static void usart_init(SerialDriver *sdp, const SerialConfig *config) {
   u->CR1 = config->cr1 | USART_CR1_UE | USART_CR1_PEIE |

                          USART_CR1_RXNEIE | USART_CR1_TE |

                          USART_CR1_RE;

-  u->ICR = 0xFFFFFFFF;

+  u->ICR = 0xFFFFFFFFU;

 }

 

 /**

@@ -247,6 +257,22 @@ static void notify6(io_queue_t *qp) {
 }

 #endif

 

+#if STM32_SERIAL_USE_UART7 || defined(__DOXYGEN__)

+static void notify7(io_queue_t *qp) {

+

+  (void)qp;

+  UART7->CR1 |= USART_CR1_TXEIE;

+}

+#endif

+

+#if STM32_SERIAL_USE_UART8 || defined(__DOXYGEN__)

+static void notify8(io_queue_t *qp) {

+

+  (void)qp;

+  UART8->CR1 |= USART_CR1_TXEIE;

+}

+#endif

+

 /*===========================================================================*/

 /* Driver interrupt handlers.                                                */

 /*===========================================================================*/

@@ -365,6 +391,44 @@ OSAL_IRQ_HANDLER(STM32_USART6_HANDLER) {
 }

 #endif

 

+#if STM32_SERIAL_USE_UART7 || defined(__DOXYGEN__)

+#if !defined(STM32_UART7_HANDLER)

+#error "STM32_UART7_HANDLER not defined"

+#endif

+/**

+ * @brief   UART7 interrupt handler.

+ *

+ * @isr

+ */

+OSAL_IRQ_HANDLER(STM32_UART7_HANDLER) {

+

+  OSAL_IRQ_PROLOGUE();

+

+  serve_interrupt(&SD7);

+

+  OSAL_IRQ_EPILOGUE();

+}

+#endif

+

+#if STM32_SERIAL_USE_UART8 || defined(__DOXYGEN__)

+#if !defined(STM32_UART8_HANDLER)

+#error "STM32_UART8_HANDLER not defined"

+#endif

+/**

+ * @brief   UART8 interrupt handler.

+ *

+ * @isr

+ */

+OSAL_IRQ_HANDLER(STM32_UART8_HANDLER) {

+

+  OSAL_IRQ_PROLOGUE();

+

+  serve_interrupt(&SD8);

+

+  OSAL_IRQ_EPILOGUE();

+}

+#endif

+

 /*===========================================================================*/

 /* Driver exported functions.                                                */

 /*===========================================================================*/

@@ -411,6 +475,18 @@ void sd_lld_init(void) {
   SD6.usart = USART6;

   SD6.clock = STM32_USART6CLK;

 #endif

+

+#if STM32_SERIAL_USE_UART7

+  sdObjectInit(&SD7, NULL, notify7);

+  SD7.usart = UART7;

+  SD7.clock = STM32_UART7CLK;

+#endif

+

+#if STM32_SERIAL_USE_UART8

+  sdObjectInit(&SD8, NULL, notify8);

+  SD8.usart = UART8;

+  SD8.clock = STM32_UART8CLK;

+#endif

 }

 

 /**

@@ -465,6 +541,18 @@ void sd_lld_start(SerialDriver *sdp, const SerialConfig *config) {
       nvicEnableVector(STM32_USART6_NUMBER, STM32_SERIAL_USART6_PRIORITY);

     }

 #endif

+#if STM32_SERIAL_USE_UART7

+    if (&SD7 == sdp) {

+      rccEnableUART7(FALSE);

+      nvicEnableVector(STM32_UART7_NUMBER, STM32_SERIAL_UART7_PRIORITY);

+    }

+#endif

+#if STM32_SERIAL_USE_UART8

+    if (&SD8 == sdp) {

+      rccEnableUART8(FALSE);

+      nvicEnableVector(STM32_UART8_NUMBER, STM32_SERIAL_UART8_PRIORITY);

+    }

+#endif

   }

   usart_init(sdp, config);

 }

@@ -524,6 +612,20 @@ void sd_lld_stop(SerialDriver *sdp) {
       return;

     }

 #endif

+#if STM32_SERIAL_USE_UART7

+    if (&SD7 == sdp) {

+      rccDisableUART7(FALSE);

+      nvicDisableVector(STM32_UART7_NUMBER);

+      return;

+    }

+#endif

+#if STM32_SERIAL_USE_UART8

+    if (&SD8 == sdp) {

+      rccDisableUART8(FALSE);

+      nvicDisableVector(STM32_UART8_NUMBER);

+      return;

+    }

+#endif

   }

 }