fixup

fpistm · fpistm · commit fc8453d5ec1a · 2022-08-22T17:24:55.000+02:00
Signed-off-by: Frederic Pillon &lt;frederic.pillon@st.com&gt;
diff --git a/cores/arduino/stm32/uart.h b/cores/arduino/stm32/uart.h
@@ -116,7 +116,7 @@ struct serial_s {
 #elif defined(LPUART1_BASE)
 #define USART3_IRQn USART3_4_LPUART1_IRQn
 #define USART3_IRQHandler USART3_4_LPUART1_IRQHandler
-#elif defined(STM32G0B0xx)
+#elif defined(USART5_BASE)
 #define USART3_IRQn USART3_4_5_6_IRQn
 #define USART3_IRQHandler USART3_4_5_6_IRQHandler
 #else
@@ -143,9 +143,8 @@ struct serial_s {
 #define USART4_IRQn USART3_4_5_6_LPUART1_IRQn
 #elif defined(LPUART1_BASE)
 #define USART4_IRQn USART3_4_LPUART1_IRQn
-#elif defined(STM32G0B0xx)
+#elif defined(USART5_BASE)
 #define USART4_IRQn USART3_4_5_6_IRQn
-#define USART4_IRQHandler USART3_4_5_6_IRQHandler
 #else
 #define USART4_IRQn USART3_4_IRQn
 #endif
@@ -163,9 +162,8 @@ struct serial_s {
 #elif defined(STM32G0xx)
 #if defined(LPUART2_BASE)
 #define USART5_IRQn USART3_4_5_6_LPUART1_IRQn
-#elif defined(STM32G0B0xx)
+#elif defined(USART5_BASE)
 #define USART5_IRQn USART3_4_5_6_IRQn
-#define USART5_IRQHandler USART3_4_5_6_IRQHandler
 #endif
 #elif defined(STM32L0xx)
 #define USART5_IRQn USART4_5_IRQn
@@ -183,9 +181,8 @@ struct serial_s {
 #elif defined(STM32G0xx)
 #if defined(LPUART2_BASE)
 #define USART6_IRQn USART3_4_5_6_LPUART1_IRQn
-#elif defined(STM32G0B0xx)
+#elif defined(USART5_BASE)
 #define USART6_IRQn USART3_4_5_6_IRQn
-#define USART6_IRQHandler USART3_4_5_6_IRQHandler
 #endif
 #endif /* STM32F0xx */
 #endif
diff --git a/libraries/SrcWrapper/src/stm32/uart.c b/libraries/SrcWrapper/src/stm32/uart.c
@@ -1024,7 +1024,7 @@ void USART3_IRQHandler(void)
   if (uart_handlers[UART4_INDEX] != NULL) {
     HAL_UART_IRQHandler(uart_handlers[UART4_INDEX]);
   }
-#if defined(STM32F030xC) || defined(STM32G0xx) && (defined(LPUART2_BASE) || defined(STM32G0B0xx))
+#if defined(STM32F030xC) || defined(STM32G0xx) && (defined(LPUART2_BASE) || defined(USART5_BASE))
   if (uart_handlers[UART5_INDEX] != NULL) {
     HAL_UART_IRQHandler(uart_handlers[UART5_INDEX]);
   }
@@ -1093,7 +1093,7 @@ void UART5_IRQHandler(void)
   * @param  None
   * @retval None
   */
-#if defined(USART6_BASE) && !defined(STM32F0xx) && !defined(STM32G0B0xx)
+#if defined(USART6_BASE) && !defined(STM32F0xx) && !defined(STM32G0xx)
 void USART6_IRQHandler(void)
 {
   HAL_NVIC_ClearPendingIRQ(USART6_IRQn);

Original file line number	Diff line number	Diff line change
`@@ -1024,7 +1024,7 @@ void USART3_IRQHandler(void)`
`1024`	`1024`	`if (uart_handlers[UART4_INDEX] != NULL) {`
`1025`	`1025`	`HAL_UART_IRQHandler(uart_handlers[UART4_INDEX]);`
`1026`	`1026`	`}`
`1027`		`-#if defined(STM32F030xC) \|\| defined(STM32G0xx) && (defined(LPUART2_BASE) \|\| defined(STM32G0B0xx))`
	`1027`	`+#if defined(STM32F030xC) \|\| defined(STM32G0xx) && (defined(LPUART2_BASE) \|\| defined(USART5_BASE))`
`1028`	`1028`	`if (uart_handlers[UART5_INDEX] != NULL) {`
`1029`	`1029`	`HAL_UART_IRQHandler(uart_handlers[UART5_INDEX]);`
`1030`	`1030`	`}`
`@@ -1093,7 +1093,7 @@ void UART5_IRQHandler(void)`
`1093`	`1093`	`* @param None`
`1094`	`1094`	`* @retval None`
`1095`	`1095`	`*/`
`1096`		`-#if defined(USART6_BASE) && !defined(STM32F0xx) && !defined(STM32G0B0xx)`
	`1096`	`+#if defined(USART6_BASE) && !defined(STM32F0xx) && !defined(STM32G0xx)`
`1097`	`1097`	`void USART6_IRQHandler(void)`
`1098`	`1098`	`{`
`1099`	`1099`	`HAL_NVIC_ClearPendingIRQ(USART6_IRQn);`