Fixed bug 3041414. Various improvements to the STM32 HAL.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2119 35acf78f-673a-0410-8e92-d51de3d6d3f4

1 files changed, 41 insertions, 32 deletions

diff --git a/os/hal/platforms/STM32/serial_lld.h b/os/hal/platforms/STM32/serial_lld.h
index 3df8b7e70..011dd865a 100644
--- a/os/hal/platforms/STM32/serial_lld.h
+++ b/os/hal/platforms/STM32/serial_lld.h
@@ -43,8 +43,8 @@
  * @details If set to @p TRUE the support for USART1 is included.

  * @note    The default is @p FALSE.

  */

-#if !defined(USE_STM32_USART1) || defined(__DOXYGEN__)

-#define USE_STM32_USART1            TRUE

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

+#define STM32_SERIAL_USE_USART1             TRUE

 #endif

 

 /**

@@ -52,8 +52,8 @@
  * @details If set to @p TRUE the support for USART2 is included.

  * @note    The default is @p TRUE.

  */

-#if !defined(USE_STM32_USART2) || defined(__DOXYGEN__)

-#define USE_STM32_USART2            TRUE

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

+#define STM32_SERIAL_USE_USART2             TRUE

 #endif

 

 /**

@@ -61,19 +61,17 @@
  * @details If set to @p TRUE the support for USART3 is included.

  * @note    The default is @p FALSE.

  */

-#if !defined(USE_STM32_USART3) || defined(__DOXYGEN__)

-#define USE_STM32_USART3            TRUE

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

+#define STM32_SERIAL_USE_USART3             TRUE

 #endif

 

-

-#if defined(STM32F10X_HD) || defined(STM32F10X_CL) || defined(__DOXYGEN__)

 /**

  * @brief   UART4 driver enable switch.

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

  * @note    The default is @p FALSE.

  */

-#if !defined(USE_STM32_UART4) || defined(__DOXYGEN__)

-#define USE_STM32_UART4             TRUE

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

+#define STM32_SERIAL_USE_UART4              TRUE

 #endif

 

 /**

@@ -81,52 +79,65 @@
  * @details If set to @p TRUE the support for UART5 is included.

  * @note    The default is @p FALSE.

  */

-#if !defined(USE_STM32_USART3) || defined(__DOXYGEN__)

-#define USE_STM32_UART5             TRUE

-#endif

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

+#define STM32_SERIAL_USE_UART5              TRUE

 #endif

 

 /**

  * @brief   USART1 interrupt priority level setting.

  */

-#if !defined(STM32_USART1_PRIORITY) || defined(__DOXYGEN__)

-#define STM32_USART1_PRIORITY       12

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

+#define STM32_SERIAL_USART1_PRIORITY        12

 #endif

 

 /**

  * @brief   USART2 interrupt priority level setting.

  */

-#if !defined(STM32_USART2_PRIORITY) || defined(__DOXYGEN__)

-#define STM32_USART2_PRIORITY       12)

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

+#define STM32_SERIAL_USART2_PRIORITY        12)

 #endif

 

 /**

  * @brief   USART3 interrupt priority level setting.

  */

-#if !defined(STM32_USART3_PRIORITY) || defined(__DOXYGEN__)

-#define STM32_USART3_PRIORITY       12

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

+#define STM32_SERIAL_USART3_PRIORITY        12

 #endif

 

-#if defined(STM32F10X_HD) || defined(STM32F10X_CL) || defined(__DOXYGEN__)

 /**

  * @brief   UART4 interrupt priority level setting.

  */

-#if !defined(STM32_UART4_PRIORITY) || defined(__DOXYGEN__)

-#define STM32_UART4_PRIORITY        12

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

+#define STM32_SERIAL_UART4_PRIORITY         12

 #endif

 

 /**

  * @brief   UART5 interrupt priority level setting.

  */

-#if !defined(STM32_UART5_PRIORITY) || defined(__DOXYGEN__)

-#define STM32_UART5_PRIORITY        12

-#endif

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

+#define STM32_SERIAL_UART5_PRIORITY         12

 #endif

 

 /*===========================================================================*/

 /* Derived constants and error checks.                                       */

 /*===========================================================================*/

 

+#if STM32_SERIAL_USE_UART4 &&                                               \

+    !(defined(STM32F10X_HD) || defined(STM32F10X_CL))

+#error "UART4 only present in HD and CL devices"

+#endif

+

+#if STM32_SERIAL_USE_UART5 &&                                               \

+    !(defined(STM32F10X_HD) || defined(STM32F10X_CL))

+#error "UART5 only present in HD and CL devices"

+#endif

+

+#if !STM32_SERIAL_USE_USART1 && !STM32_SERIAL_USE_USART2 &&                 \

+    !STM32_SERIAL_USE_USART3 && !STM32_SERIAL_USE_UART4  &&                 \

+    !STM32_SERIAL_USE_UART5

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

+#endif

+

 /*===========================================================================*/

 /* Driver data structures and types.                                         */

 /*===========================================================================*/

@@ -202,23 +213,21 @@ typedef struct {
 /* External declarations.                                                    */

 /*===========================================================================*/

 

-#if USE_STM32_USART1 && !defined(__DOXYGEN__)

+#if STM32_SERIAL_USE_USART1 && !defined(__DOXYGEN__)

 extern SerialDriver SD1;

 #endif

-#if USE_STM32_USART2 && !defined(__DOXYGEN__)

+#if STM32_SERIAL_USE_USART2 && !defined(__DOXYGEN__)

 extern SerialDriver SD2;

 #endif

-#if USE_STM32_USART3 && !defined(__DOXYGEN__)

+#if STM32_SERIAL_USE_USART3 && !defined(__DOXYGEN__)

 extern SerialDriver SD3;

 #endif

-#if defined(STM32F10X_HD) || defined(STM32F10X_CL)

-#if USE_STM32_UART4 && !defined(__DOXYGEN__)

+#if STM32_SERIAL_USE_UART4 && !defined(__DOXYGEN__)

 extern SerialDriver SD4;

 #endif

-#if USE_STM32_UART5 && !defined(__DOXYGEN__)

+#if STM32_SERIAL_USE_UART5 && !defined(__DOXYGEN__)

 extern SerialDriver SD5;

 #endif

-#endif

 

 #ifdef __cplusplus

 extern "C" {