From a544fee35fd6d495823d8d5a18f7e3f1bced786f Mon Sep 17 00:00:00 2001
From: cinsights <none@example.com>
Date: Wed, 30 Sep 2020 23:49:12 +0000
Subject: [PATCH] USARTv1 update typo fixes

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@13879 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
---
 .../ports/STM32/LLD/USARTv1/hal_serial_lld.h  |  4 ++--
 os/hal/ports/STM32/LLD/USARTv1/hal_uart_lld.c |  2 +-
 os/hal/ports/STM32/LLD/USARTv1/hal_uart_lld.h | 22 +++++++++----------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/os/hal/ports/STM32/LLD/USARTv1/hal_serial_lld.h b/os/hal/ports/STM32/LLD/USARTv1/hal_serial_lld.h
index 9914f7c1e..20846f0d9 100644
--- a/os/hal/ports/STM32/LLD/USARTv1/hal_serial_lld.h
+++ b/os/hal/ports/STM32/LLD/USARTv1/hal_serial_lld.h
@@ -369,7 +369,7 @@
 
 #if STM32_SERIAL_USE_UART9
 #if defined(STM32_UART9_IS_USED)
-#error "SD8 requires UART9 but it is already used"
+#error "SD9 requires UART9 but it is already used"
 #else
 #define STM32_UART9_IS_USED
 #endif
@@ -377,7 +377,7 @@
 
 #if STM32_SERIAL_USE_UART10
 #if defined(STM32_UART10_IS_USED)
-#error "SD8 requires UART10 but it is already used"
+#error "SD10 requires UART10 but it is already used"
 #else
 #define STM32_UART10_IS_USED
 #endif
diff --git a/os/hal/ports/STM32/LLD/USARTv1/hal_uart_lld.c b/os/hal/ports/STM32/LLD/USARTv1/hal_uart_lld.c
index 2c8bbf4e5..deadc1453 100644
--- a/os/hal/ports/STM32/LLD/USARTv1/hal_uart_lld.c
+++ b/os/hal/ports/STM32/LLD/USARTv1/hal_uart_lld.c
@@ -924,7 +924,7 @@ void uart_lld_start(UARTDriver *uartp) {
       osalDbgAssert(uartp->dmatx != NULL, "unable to allocate stream");
 
       rccEnableUART9(true);
-      nvicEnableVector(STM32_UART9_NUMBER, STM32_UART_UART10_IRQ_PRIORITY);
+      nvicEnableVector(STM32_UART10_NUMBER, STM32_UART_UART10_IRQ_PRIORITY);
       uartp->dmarxmode |= STM32_DMA_CR_CHSEL(UART10_RX_DMA_CHANNEL) |
                           STM32_DMA_CR_PL(STM32_UART_UART10_DMA_PRIORITY);
       uartp->dmatxmode |= STM32_DMA_CR_CHSEL(UART10_TX_DMA_CHANNEL) |
diff --git a/os/hal/ports/STM32/LLD/USARTv1/hal_uart_lld.h b/os/hal/ports/STM32/LLD/USARTv1/hal_uart_lld.h
index fa02ed2d1..b43e2c848 100644
--- a/os/hal/ports/STM32/LLD/USARTv1/hal_uart_lld.h
+++ b/os/hal/ports/STM32/LLD/USARTv1/hal_uart_lld.h
@@ -416,7 +416,7 @@
 #endif
 
 #if STM32_UART_USE_UART9 &&                                                 \
-    !OSAL_IRQ_IS_VALID_PRIORITY(STM32_UART_UART89_IRQ_PRIORITY)
+    !OSAL_IRQ_IS_VALID_PRIORITY(STM32_UART_UART9_IRQ_PRIORITY)
 #error "Invalid IRQ priority assigned to UART9"
 #endif
 
@@ -658,7 +658,7 @@
 /* Checks on allocation of USARTx units.*/
 #if STM32_UART_USE_USART1
 #if defined(STM32_USART1_IS_USED)
-#error "SD1 requires USART1 but it is already used"
+#error "UARTD1 requires USART1 but it is already used"
 #else
 #define STM32_USART1_IS_USED
 #endif
@@ -666,7 +666,7 @@
 
 #if STM32_UART_USE_USART2
 #if defined(STM32_USART2_IS_USED)
-#error "SD2 requires USART2 but it is already used"
+#error "UARTD2 requires USART2 but it is already used"
 #else
 #define STM32_USART2_IS_USED
 #endif
@@ -674,7 +674,7 @@
 
 #if STM32_UART_USE_USART3
 #if defined(STM32_USART3_IS_USED)
-#error "SD3 requires USART3 but it is already used"
+#error "UARTD3 requires USART3 but it is already used"
 #else
 #define STM32_USART3_IS_USED
 #endif
@@ -682,7 +682,7 @@
 
 #if STM32_UART_USE_UART4
 #if defined(STM32_UART4_IS_USED)
-#error "SD4 requires UART4 but it is already used"
+#error "UARTD4 requires UART4 but it is already used"
 #else
 #define STM32_UART4_IS_USED
 #endif
@@ -690,7 +690,7 @@
 
 #if STM32_UART_USE_UART5
 #if defined(STM32_UART5_IS_USED)
-#error "SD5 requires UART5 but it is already used"
+#error "UARTD5 requires UART5 but it is already used"
 #else
 #define STM32_UART5_IS_USED
 #endif
@@ -698,7 +698,7 @@
 
 #if STM32_UART_USE_USART6
 #if defined(STM32_USART6_IS_USED)
-#error "SD6 requires USART6 but it is already used"
+#error "UARTD6 requires USART6 but it is already used"
 #else
 #define STM32_USART6_IS_USED
 #endif
@@ -706,7 +706,7 @@
 
 #if STM32_UART_USE_UART7
 #if defined(STM32_UART7_IS_USED)
-#error "SD7 requires UART7 but it is already used"
+#error "UARTD7 requires UART7 but it is already used"
 #else
 #define STM32_UART7_IS_USED
 #endif
@@ -714,7 +714,7 @@
 
 #if STM32_UART_USE_UART8
 #if defined(STM32_UART8_IS_USED)
-#error "SD8 requires UART8 but it is already used"
+#error "UARTD8 requires UART8 but it is already used"
 #else
 #define STM32_UART8_IS_USED
 #endif
@@ -722,7 +722,7 @@
 
 #if STM32_UART_USE_UART9
 #if defined(STM32_UART9_IS_USED)
-#error "SD8 requires UART9 but it is already used"
+#error "UARTD9 requires UART9 but it is already used"
 #else
 #define STM32_UART9_IS_USED
 #endif
@@ -730,7 +730,7 @@
 
 #if STM32_UART_USE_UART10
 #if defined(STM32_UART10_IS_USED)
-#error "SD10 requires UART10 but it is already used"
+#error "UARTD10 requires UART10 but it is already used"
 #else
 #define STM32_UART10_IS_USED
 #endif