[U(S)ART] Add USART10 support

fpistm · fpistm · commit 98dd715310d0 · 2020-12-04T10:42:37.000+01:00
Available in some STM32H7 mcu

Signed-off-by: Frederic Pillon &lt;frederic.pillon@st.com&gt;
diff --git a/cores/arduino/HardwareSerial.cpp b/cores/arduino/HardwareSerial.cpp
@@ -95,7 +95,11 @@
   #endif
 
   #if defined(HAVE_HWSERIAL10)
-    HardwareSerial Serial10(UART10);
+    #if defined(USART10)
+      HardwareSerial Serial10(USART10);
+    #else
+      HardwareSerial Serial10(UART10);
+    #endif
     void serialEvent10() __attribute__((weak));
   #endif
 
@@ -218,16 +222,22 @@ HardwareSerial::HardwareSerial(void *peripheral, HalfDuplexMode_t halfDuplex)
                     setTx(PIN_SERIAL8_TX);
                   } else
 #endif
-#if defined(PIN_SERIAL9_TX) && defined(UART9)
+#if defined(PIN_SERIAL9_TX) && defined(UART9_BASE)
                     if (peripheral == UART9) {
 #if defined(PIN_SERIAL9_RX)
                       setRx(PIN_SERIAL9_RX);
 #endif
                       setTx(PIN_SERIAL9_TX);
                     } else
 #endif
-#if defined(PIN_SERIAL10_TX) && defined(UART10)
-                      if (peripheral == UART10) {
+#if defined(PIN_SERIAL10_TX) &&\
+   (defined(USART10_BASE) || defined(UART10_BASE))
+#if defined(USART10_BASE)
+                      if (peripheral == USART10)
+#elif defined(UART10_BASE)
+                      if (peripheral == UART10)
+#endif
+                      {
 #if defined(PIN_SERIAL10_RX)
                         setRx(PIN_SERIAL10_RX);
 #endif
diff --git a/cores/arduino/WSerial.cpp b/cores/arduino/WSerial.cpp
@@ -48,7 +48,7 @@ WEAK void serialEventRun(void)
   }
 #endif
 #if defined(HAVE_HWSERIAL10)
-  if (serialEventl10 && Serial10.available()) {
+  if (serialEvent10 && Serial10.available()) {
     serialEvent10();
   }
 #endif
diff --git a/cores/arduino/WSerial.h b/cores/arduino/WSerial.h
@@ -164,7 +164,7 @@
     #endif
   #endif
   #if defined(ENABLE_HWSERIAL10)
-    #if defined(UART10_BASE)
+    #if defined(USART10_BASE) || defined(UART10_BASE)
       #define HAVE_HWSERIAL10
     #endif
   #endif
diff --git a/keywords.txt b/keywords.txt
@@ -796,6 +796,7 @@ USART7	LITERAL1
 UART8	LITERAL1
 UART9	LITERAL1
 UART10	LITERAL1
+USART10	LITERAL1
 LPUART1	LITERAL1
 
 # Port
diff --git a/libraries/SrcWrapper/src/stm32/uart.c b/libraries/SrcWrapper/src/stm32/uart.c
@@ -87,7 +87,7 @@ typedef enum {
 #if defined(UART9_BASE)
   UART9_INDEX,
 #endif
-#if defined(UART10_BASE)
+#if defined(UART10_BASE) || defined(USART10_BASE)
   UART10_INDEX,
 #endif
 #if defined(LPUART1_BASE)
@@ -284,6 +284,15 @@ void uart_init(serial_t *obj, uint32_t baudrate, uint32_t databits, uint32_t par
     obj->irq = UART10_IRQn;
   }
 #endif
+#if defined(USART10_BASE)
+  else if (obj->uart == USART10) {
+    __HAL_RCC_USART10_FORCE_RESET();
+    __HAL_RCC_USART10_RELEASE_RESET();
+    __HAL_RCC_USART10_CLK_ENABLE();
+    obj->index = UART10_INDEX;
+    obj->irq = USART10_IRQn;
+  }
+#endif
 
 #if defined(STM32F091xC) || defined (STM32F098xx)
   /* Enable SYSCFG Clock */
@@ -487,6 +496,13 @@ void uart_deinit(serial_t *obj)
       __HAL_RCC_UART10_RELEASE_RESET();
       __HAL_RCC_UART10_CLK_DISABLE();
       break;
+#endif
+#if defined(USART10_BASE)
+    case UART10_INDEX:
+      __HAL_RCC_USART10_FORCE_RESET();
+      __HAL_RCC_USART10_RELEASE_RESET();
+      __HAL_RCC_USART10_CLK_DISABLE();
+      break;
 #endif
   }
 
@@ -1062,6 +1078,19 @@ void UART10_IRQHandler(void)
 }
 #endif
 
+/**
+  * @brief  USART 10 IRQ handler
+  * @param  None
+  * @retval None
+  */
+#if defined(USART10_BASE)
+void USART10_IRQHandler(void)
+{
+  HAL_NVIC_ClearPendingIRQ(USART10_IRQn);
+  HAL_UART_IRQHandler(uart_handlers[UART10_INDEX]);
+}
+#endif
+
 /**
   * @brief  HAL UART Call Back
   * @param  UART handler

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ WEAK void serialEventRun(void)`
`48`	`48`	`}`
`49`	`49`	`#endif`
`50`	`50`	`#if defined(HAVE_HWSERIAL10)`
`51`		`- if (serialEventl10 && Serial10.available()) {`
	`51`	`+ if (serialEvent10 && Serial10.available()) {`
`52`	`52`	`serialEvent10();`
`53`	`53`	`}`
`54`	`54`	`#endif`