• R/O
  • SSH
  • HTTPS

chibios: 提交


Commit MetaInfo

修订版13874 (tree)
时间2020-09-30 17:03:18
作者gdisirio

Log Message

Added missing USARTv1 definitions.

更改概述

差异

--- trunk/os/hal/ports/STM32/LLD/USARTv1/hal_serial_lld.h (revision 13873)
+++ trunk/os/hal/ports/STM32/LLD/USARTv1/hal_serial_lld.h (revision 13874)
@@ -251,6 +251,71 @@
251251 #error "Invalid IRQ priority assigned to UART8"
252252 #endif
253253
254+/* Checks on allocation of USARTx units.*/
255+#if STM32_SERIAL_USE_USART1
256+#if defined(STM32_USART1_IS_USED)
257+#error "SD1 requires USART1 but it is already used"
258+#else
259+#define STM32_USART1_IS_USED
260+#endif
261+#endif
262+
263+#if STM32_SERIAL_USE_USART2
264+#if defined(STM32_USART2_IS_USED)
265+#error "SD2 requires USART2 but it is already used"
266+#else
267+#define STM32_USART2_IS_USED
268+#endif
269+#endif
270+
271+#if STM32_SERIAL_USE_USART3
272+#if defined(STM32_USART3_IS_USED)
273+#error "SD3 requires USART3 but it is already used"
274+#else
275+#define STM32_USART3_IS_USED
276+#endif
277+#endif
278+
279+#if STM32_SERIAL_USE_UART4
280+#if defined(STM32_UART4_IS_USED)
281+#error "SD4 requires UART4 but it is already used"
282+#else
283+#define STM32_UART4_IS_USED
284+#endif
285+#endif
286+
287+#if STM32_SERIAL_USE_UART5
288+#if defined(STM32_UART5_IS_USED)
289+#error "SD5 requires UART5 but it is already used"
290+#else
291+#define STM32_UART5_IS_USED
292+#endif
293+#endif
294+
295+#if STM32_SERIAL_USE_USART6
296+#if defined(STM32_USART6_IS_USED)
297+#error "SD6 requires USART6 but it is already used"
298+#else
299+#define STM32_USART6_IS_USED
300+#endif
301+#endif
302+
303+#if STM32_SERIAL_USE_UART7
304+#if defined(STM32_UART7_IS_USED)
305+#error "SD7 requires UART7 but it is already used"
306+#else
307+#define STM32_UART7_IS_USED
308+#endif
309+#endif
310+
311+#if STM32_SERIAL_USE_UART8
312+#if defined(STM32_UART8_IS_USED)
313+#error "SD8 requires UART8 but it is already used"
314+#else
315+#define STM32_UART8_IS_USED
316+#endif
317+#endif
318+
254319 /*===========================================================================*/
255320 /* Driver data structures and types. */
256321 /*===========================================================================*/
--- trunk/os/hal/ports/STM32/LLD/USARTv1/hal_uart_lld.h (revision 13873)
+++ trunk/os/hal/ports/STM32/LLD/USARTv1/hal_uart_lld.h (revision 13874)
@@ -540,6 +540,71 @@
540540 #define STM32_DMA_REQUIRED
541541 #endif
542542
543+/* Checks on allocation of USARTx units.*/
544+#if STM32_UART_USE_USART1
545+#if defined(STM32_USART1_IS_USED)
546+#error "SD1 requires USART1 but it is already used"
547+#else
548+#define STM32_USART1_IS_USED
549+#endif
550+#endif
551+
552+#if STM32_UART_USE_USART2
553+#if defined(STM32_USART2_IS_USED)
554+#error "SD2 requires USART2 but it is already used"
555+#else
556+#define STM32_USART2_IS_USED
557+#endif
558+#endif
559+
560+#if STM32_UART_USE_USART3
561+#if defined(STM32_USART3_IS_USED)
562+#error "SD3 requires USART3 but it is already used"
563+#else
564+#define STM32_USART3_IS_USED
565+#endif
566+#endif
567+
568+#if STM32_UART_USE_UART4
569+#if defined(STM32_UART4_IS_USED)
570+#error "SD4 requires UART4 but it is already used"
571+#else
572+#define STM32_UART4_IS_USED
573+#endif
574+#endif
575+
576+#if STM32_UART_USE_UART5
577+#if defined(STM32_UART5_IS_USED)
578+#error "SD5 requires UART5 but it is already used"
579+#else
580+#define STM32_UART5_IS_USED
581+#endif
582+#endif
583+
584+#if STM32_UART_USE_USART6
585+#if defined(STM32_USART6_IS_USED)
586+#error "SD6 requires USART6 but it is already used"
587+#else
588+#define STM32_USART6_IS_USED
589+#endif
590+#endif
591+
592+#if STM32_UART_USE_UART7
593+#if defined(STM32_UART7_IS_USED)
594+#error "SD7 requires UART7 but it is already used"
595+#else
596+#define STM32_UART7_IS_USED
597+#endif
598+#endif
599+
600+#if STM32_UART_USE_UART8
601+#if defined(STM32_UART8_IS_USED)
602+#error "SD8 requires UART8 but it is already used"
603+#else
604+#define STM32_UART8_IS_USED
605+#endif
606+#endif
607+
543608 /*===========================================================================*/
544609 /* Driver data structures and types. */
545610 /*===========================================================================*/
Show on old repository browser