Added UART7/8 support to STM32 UART USARTv1 driver.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12457 110e8d01-0319-4d1e-a829-52ad28d1bb01

1 files changed, 124 insertions, 1 deletions

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 fcf73e7fb..a1369cc1a 100644
--- a/os/hal/ports/STM32/LLD/USARTv1/hal_uart_lld.h
+++ b/os/hal/ports/STM32/LLD/USARTv1/hal_uart_lld.h
@@ -94,6 +94,24 @@
 #endif

 

 /**

+ * @brief   UART driver on UART7 enable switch.

+ * @details If set to @p TRUE the support for UART7 is included.

+ * @note    The default is @p FALSE.

+ */

+#if !defined(STM32_UART_USE_UART7) || defined(__DOXYGEN__)

+#define STM32_UART_USE_UART7                FALSE

+#endif

+

+/**

+ * @brief   UART driver on UART8 enable switch.

+ * @details If set to @p TRUE the support for UART8 is included.

+ * @note    The default is @p FALSE.

+ */

+#if !defined(STM32_UART_USE_UART8) || defined(__DOXYGEN__)

+#define STM32_UART_USE_UART8                FALSE

+#endif

+

+/**

  * @brief   USART1 interrupt priority level setting.

  */

 #if !defined(STM32_UART_USART1_IRQ_PRIORITY) || defined(__DOXYGEN__)

@@ -136,6 +154,20 @@
 #endif

 

 /**

+ * @brief   UART7 interrupt priority level setting.

+ */

+#if !defined(STM32_UART_UART7_IRQ_PRIORITY) || defined(__DOXYGEN__)

+#define STM32_UART_UART7_IRQ_PRIORITY       12

+#endif

+

+/**

+ * @brief   UART8 interrupt priority level setting.

+ */

+#if !defined(STM32_UART_UART8_IRQ_PRIORITY) || defined(__DOXYGEN__)

+#define STM32_UART_UART8_IRQ_PRIORITY       12

+#endif

+

+/**

  * @brief   USART1 DMA priority (0..3|lowest..highest).

  * @note    The priority level is used for both the TX and RX DMA channels but

  *          because of the channels ordering the RX channel has always priority

@@ -196,6 +228,26 @@
 #endif

 

 /**

+ * @brief   UART7 DMA priority (0..3|lowest..highest).

+ * @note    The priority level is used for both the TX and RX DMA channels but

+ *          because of the channels ordering the RX channel has always priority

+ *          over the TX channel.

+ */

+#if !defined(STM32_UART_UART7_DMA_PRIORITY) || defined(__DOXYGEN__)

+#define STM32_UART_UART7_DMA_PRIORITY       0

+#endif

+

+/**

+ * @brief   UART8 DMA priority (0..3|lowest..highest).

+ * @note    The priority level is used for both the TX and RX DMA channels but

+ *          because of the channels ordering the RX channel has always priority

+ *          over the TX channel.

+ */

+#if !defined(STM32_UART_UART8_DMA_PRIORITY) || defined(__DOXYGEN__)

+#define STM32_UART_UART8_DMA_PRIORITY       0

+#endif

+

+/**

  * @brief   USART DMA error hook.

  * @note    The default action for DMA errors is a system halt because DMA

  *          error can only happen because programming errors.

@@ -247,9 +299,18 @@
 #error "USART6 not present in the selected device"

 #endif

 

+#if STM32_UART_USE_UART7 && !STM32_HAS_UART7

+#error "UART7 not present in the selected device"

+#endif

+

+#if STM32_UART_USE_UART8 && !STM32_HAS_UART8

+#error "UART8 not present in the selected device"

+#endif

+

 #if !STM32_UART_USE_USART1 && !STM32_UART_USE_USART2 &&                     \

     !STM32_UART_USE_USART3 && !STM32_UART_USE_UART4 &&                      \

-    !STM32_UART_USE_UART5  && !STM32_UART_USE_USART6

+    !STM32_UART_USE_UART5  && !STM32_UART_USE_USART6 &&                     \

+    !STM32_UART_USE_UART7  && !STM32_UART_USE_UART8

 #error "UART driver activated but no USART/UART peripheral assigned"

 #endif

 

@@ -283,6 +344,16 @@
 #error "Invalid IRQ priority assigned to USART6"

 #endif

 

+#if STM32_UART_USE_UART7 &&                                                 \

+    !OSAL_IRQ_IS_VALID_PRIORITY(STM32_UART_UART7_IRQ_PRIORITY)

+#error "Invalid IRQ priority assigned to UART7"

+#endif

+

+#if STM32_UART_USE_UART8 &&                                                 \

+    !OSAL_IRQ_IS_VALID_PRIORITY(STM32_UART_UART8_IRQ_PRIORITY)

+#error "Invalid IRQ priority assigned to UART8"

+#endif

+

 #if STM32_UART_USE_USART1 &&                                                \

     !STM32_DMA_IS_VALID_PRIORITY(STM32_UART_USART1_DMA_PRIORITY)

 #error "Invalid DMA priority assigned to USART1"

@@ -313,6 +384,16 @@
 #error "Invalid DMA priority assigned to USART6"

 #endif

 

+#if STM32_UART_USE_UART7 &&                                                 \

+    !STM32_DMA_IS_VALID_PRIORITY(STM32_UART_UART7_DMA_PRIORITY)

+#error "Invalid DMA priority assigned to UART7"

+#endif

+

+#if STM32_UART_USE_UART8 &&                                                 \

+    !STM32_DMA_IS_VALID_PRIORITY(STM32_UART_UART8_DMA_PRIORITY)

+#error "Invalid DMA priority assigned to UART8"

+#endif

+

 /* The following checks are only required when there is a DMA able to

    reassign streams to different channels.*/

 #if STM32_ADVANCED_DMA

@@ -347,6 +428,16 @@
 #error "USART6 DMA streams not defined"

 #endif

 

+#if STM32_UART_USE_UART7 && (!defined(STM32_UART_UART7_RX_DMA_STREAM) ||    \

+                             !defined(STM32_UART_UART7_TX_DMA_STREAM))

+#error "UART7 DMA streams not defined"

+#endif

+

+#if STM32_UART_USE_UART8 && (!defined(STM32_UART_UART8_RX_DMA_STREAM) ||    \

+                             !defined(STM32_UART_UART8_TX_DMA_STREAM))

+#error "UART8 DMA streams not defined"

+#endif

+

 /* Check on the validity of the assigned DMA channels.*/

 #if STM32_UART_USE_USART1 &&                                                \

     !STM32_DMA_IS_VALID_ID(STM32_UART_USART1_RX_DMA_STREAM,                 \

@@ -421,6 +512,30 @@
 #endif

 #endif /* STM32_ADVANCED_DMA */

 

+#if STM32_UART_USE_UART7 &&                                                 \

+    !STM32_DMA_IS_VALID_ID(STM32_UART_UART7_RX_DMA_STREAM,                  \

+                           STM32_UART7_RX_DMA_MSK)

+#error "invalid DMA stream associated to UART7 RX"

+#endif

+

+#if STM32_UART_USE_UART7 &&                                                 \

+    !STM32_DMA_IS_VALID_ID(STM32_UART_UART7_TX_DMA_STREAM,                  \

+                           STM32_UART7_TX_DMA_MSK)

+#error "invalid DMA stream associated to UART7 TX"

+#endif

+

+#if STM32_UART_USE_UART8 &&                                                 \

+    !STM32_DMA_IS_VALID_ID(STM32_UART_UART8_RX_DMA_STREAM,                  \

+                           STM32_UART8_RX_DMA_MSK)

+#error "invalid DMA stream associated to UART8 RX"

+#endif

+

+#if STM32_UART_USE_UART8 &&                                                 \

+    !STM32_DMA_IS_VALID_ID(STM32_UART_UART8_TX_DMA_STREAM,                  \

+                           STM32_UART8_TX_DMA_MSK)

+#error "invalid DMA stream associated to UART8 TX"

+#endif

+

 #if !defined(STM32_DMA_REQUIRED)

 #define STM32_DMA_REQUIRED

 #endif

@@ -604,6 +719,14 @@ extern UARTDriver UARTD5;
 extern UARTDriver UARTD6;

 #endif

 

+#if STM32_UART_USE_UART7 && !defined(__DOXYGEN__)

+extern UARTDriver UARTD7;

+#endif

+

+#if STM32_UART_USE_UART8 && !defined(__DOXYGEN__)

+extern UARTDriver UARTD8;

+#endif

+

 #ifdef __cplusplus

 extern "C" {

 #endif