1 files changed, 101 insertions, 1 deletions
diff --git a/os/hal/ports/STM32/LLD/USARTv1/serial_lld.c b/os/hal/ports/STM32/LLD/USARTv1/serial_lld.c
index 69b725d10..801b4fa20 100644
--- a/os/hal/ports/STM32/LLD/USARTv1/serial_lld.c
+++ b/os/hal/ports/STM32/LLD/USARTv1/serial_lld.c
@@ -64,6 +64,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.                                         */
 /*===========================================================================*/
@@ -252,6 +262,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.                                                */
 /*===========================================================================*/
@@ -356,7 +382,7 @@ OSAL_IRQ_HANDLER(STM32_UART5_HANDLER) {
 #error "STM32_USART6_HANDLER not defined"
 #endif
 /**
- * @brief   USART1 interrupt handler.
+ * @brief   USART6 interrupt handler.
  *
  * @isr
  */
@@ -370,6 +396,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.                                                */
 /*===========================================================================*/
@@ -410,6 +474,16 @@ void sd_lld_init(void) {
   sdObjectInit(&SD6, NULL, notify6);
   SD6.usart = USART6;
 #endif
+
+#if STM32_SERIAL_USE_UART7
+  sdObjectInit(&SD7, NULL, notify7);
+  SD7.usart = UART7;
+#endif
+
+#if STM32_SERIAL_USE_UART8
+  sdObjectInit(&SD8, NULL, notify8);
+  SD8.usart = UART8;
+#endif
 }
 
 /**
@@ -464,6 +538,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);
 }
@@ -523,6 +609,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
   }
 }