Introduce stm32_assert.h for MBED port

When we want to activate USE_FULL_ASSERT macro in STM32 CUBE, there is a need to have the assert map to MBED. The easiest way to have this definition in a single place for all STM32 HAL and LL files using it, is to add a specific header file where the porting to MBED is done.
2017-05-24 11:14:21 +02:00 · 2017-05-24 11:14:21 +02:00 · 8576993a1a
parent 5b510a35a6
commit 8576993a1a
10 changed files with 61 additions and 90 deletions
--- a/targets/TARGET_STM/TARGET_STM32F0/device/stm32f0xx_hal_conf.h
+++ b/targets/TARGET_STM/TARGET_STM32F0/device/stm32f0xx_hal_conf.h
@ -297,16 +297,8 @@

 /* Exported macro ------------------------------------------------------------*/
 #ifdef  USE_FULL_ASSERT
-/**
-  * @brief  The assert_param macro is used for function's parameters check.
-  * @param  expr: If expr is false, it calls assert_failed function
-  *         which reports the name of the source file and the source
-  *         line number of the call that failed. 
-  *         If expr is true, it returns no value.
-  * @retval None
-  */
-  #include "mbed_assert.h"
-  #define assert_param(expr) MBED_ASSERT(expr)
+/* ALL MBED targets use same stm32_assert.h */
+#include "stm32_assert.h"
 #else
  #define assert_param(expr) ((void)0U)
 #endif /* USE_FULL_ASSERT */    
--- a/targets/TARGET_STM/TARGET_STM32F1/device/stm32f1xx_hal_conf.h
+++ b/targets/TARGET_STM/TARGET_STM32F1/device/stm32f1xx_hal_conf.h
@ -357,16 +357,8 @@

 /* Exported macro ------------------------------------------------------------*/
 #ifdef  USE_FULL_ASSERT
-/**
-  * @brief  The assert_param macro is used for function's parameters check.
-  * @param  expr: If expr is false, it calls assert_failed function
-  *         which reports the name of the source file and the source
-  *         line number of the call that failed. 
-  *         If expr is true, it returns no value.
-  * @retval None
-  */
-  #include "mbed_assert.h"
-  #define assert_param(expr) MBED_ASSERT(expr)
+/* ALL MBED targets use same stm32_assert.h */
+#include "stm32_assert.h"
 #else
  #define assert_param(expr) ((void)0U)
 #endif /* USE_FULL_ASSERT */
--- a/targets/TARGET_STM/TARGET_STM32F2/device/stm32f2xx_hal_conf.h
+++ b/targets/TARGET_STM/TARGET_STM32F2/device/stm32f2xx_hal_conf.h
@ -377,16 +377,8 @@
 #endif /* HAL_MMC_MODULE_ENABLED */
 /* Exported macro ------------------------------------------------------------*/
 #ifdef  USE_FULL_ASSERT
-/**
-  * @brief  The assert_param macro is used for function's parameters check.
-  * @param  expr: If expr is false, it calls assert_failed function
-  *         which reports the name of the source file and the source
-  *         line number of the call that failed. 
-  *         If expr is true, it returns no value.
-  * @retval None
-  */
-  #include "mbed_assert.h"
-  #define assert_param(expr) MBED_ASSERT(expr)
+/* ALL MBED targets use same stm32_assert.h */
+#include "stm32_assert.h"
 #else
  #define assert_param(expr) ((void)0U)
 #endif /* USE_FULL_ASSERT */
--- a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_conf.h
+++ b/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_conf.h
@ -313,16 +313,8 @@

 /* Exported macro ------------------------------------------------------------*/
 #ifdef  USE_FULL_ASSERT
-/**
-  * @brief  The assert_param macro is used for function's parameters check.
-  * @param  expr: If expr is false, it calls assert_failed function
-  *         which reports the name of the source file and the source
-  *         line number of the call that failed. 
-  *         If expr is true, it returns no value.
-  * @retval None
-  */
-  #include "mbed_assert.h"
-  #define assert_param(expr) MBED_ASSERT(expr)
+/* ALL MBED targets use same stm32_assert.h */
+#include "stm32_assert.h"
 #else
  #define assert_param(expr) ((void)0U)
 #endif /* USE_FULL_ASSERT */    
--- a/targets/TARGET_STM/TARGET_STM32F4/device/stm32f4xx_hal_conf.h
+++ b/targets/TARGET_STM/TARGET_STM32F4/device/stm32f4xx_hal_conf.h
@ -431,16 +431,8 @@

 /* Exported macro ------------------------------------------------------------*/
 #ifdef  USE_FULL_ASSERT
-/**
-  * @brief  The assert_param macro is used for function's parameters check.
-  * @param  expr: If expr is false, it calls assert_failed function
-  *         which reports the name of the source file and the source
-  *         line number of the call that failed.
-  *         If expr is true, it returns no value.
-  * @retval None
-  */
-  #include "mbed_assert.h"
-  #define assert_param(expr) MBED_ASSERT(expr)
+/* ALL MBED targets use same stm32_assert.h */
+#include "stm32_assert.h"
 #else
  #define assert_param(expr) ((void)0U)
 #endif /* USE_FULL_ASSERT */
--- a/targets/TARGET_STM/TARGET_STM32F7/device/stm32f7xx_hal_conf.h
+++ b/targets/TARGET_STM/TARGET_STM32F7/device/stm32f7xx_hal_conf.h
@ -438,16 +438,8 @@

 /* Exported macro ------------------------------------------------------------*/
 #ifdef  USE_FULL_ASSERT
-/**
-  * @brief  The assert_param macro is used for function's parameters check.
-  * @param  expr: If expr is false, it calls assert_failed function
-  *         which reports the name of the source file and the source
-  *         line number of the call that failed.
-  *         If expr is true, it returns no value.
-  * @retval None
-  */
-  #include "mbed_assert.h"
-  #define assert_param(expr) MBED_ASSERT(expr)
+/* ALL MBED targets use same stm32_assert.h */
+#include "stm32_assert.h"
 #else
  #define assert_param(expr) ((void)0)
 #endif /* USE_FULL_ASSERT */
--- a/targets/TARGET_STM/TARGET_STM32L0/device/stm32l0xx_hal_conf.h
+++ b/targets/TARGET_STM/TARGET_STM32L0/device/stm32l0xx_hal_conf.h
@ -296,16 +296,8 @@

 /* Exported macro ------------------------------------------------------------*/
 #ifdef  USE_FULL_ASSERT
-/**
-  * @brief  The assert_param macro is used for function's parameters check.
-  * @param  expr: If expr is false, it calls assert_failed function
-  *         which reports the name of the source file and the source
-  *         line number of the call that failed.
-  *         If expr is true, it returns no value.
-  * @retval None
-  */
-  #include "mbed_assert.h"
-  #define assert_param(expr) MBED_ASSERT(expr)
+/* ALL MBED targets use same stm32_assert.h */
+#include "stm32_assert.h"
 #else
  #define assert_param(expr) ((void)0U)
 #endif /* USE_FULL_ASSERT */
--- a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_conf.h
+++ b/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_conf.h
@ -264,16 +264,8 @@ extern "C" {

 /* Exported macro ------------------------------------------------------------*/
 #ifdef  USE_FULL_ASSERT
-/**
-  * @brief  The assert_param macro is used for function's parameters check.
-  * @param  expr: If expr is false, it calls assert_failed function
-  *         which reports the name of the source file and the source
-  *         line number of the call that failed.
-  *         If expr is true, it returns no value.
-  * @retval None
-  */
-#include "mbed_assert.h"
-#define assert_param(expr) MBED_ASSERT(expr)
+/* ALL MBED targets use same stm32_assert.h */
+#include "stm32_assert.h"
 #else
 #define assert_param(expr) ((void)0U)
 #endif /* USE_FULL_ASSERT */
--- a/targets/TARGET_STM/TARGET_STM32L4/device/stm32l4xx_hal_conf.h
+++ b/targets/TARGET_STM/TARGET_STM32L4/device/stm32l4xx_hal_conf.h
@ -381,16 +381,8 @@

 /* Exported macro ------------------------------------------------------------*/
 #ifdef  USE_FULL_ASSERT
-/**
-  * @brief  The assert_param macro is used for function's parameters check.
-  * @param  expr: If expr is false, it calls assert_failed function
-  *         which reports the name of the source file and the source
-  *         line number of the call that failed.
-  *         If expr is true, it returns no value.
-  * @retval None
-  */
-  #include "mbed_assert.h"
-  #define assert_param(expr) MBED_ASSERT(expr)
+/* ALL MBED targets use same stm32_assert.h */
+#include "stm32_assert.h"
 #else
  #define assert_param(expr) ((void)0U)
 #endif /* USE_FULL_ASSERT */
--- a/targets/TARGET_STM/stm32_assert.h
+++ b/targets/TARGET_STM/stm32_assert.h
@ -0,0 +1,43 @@
+/* mbed Microcontroller Library
+ *******************************************************************************
+ * Copyright (c) 2017, STMicroelectronics
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. Neither the name of STMicroelectronics nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *******************************************************************************
+ */
+#ifndef STM32_ASSERT_H
+#define STM32_ASSERT_H
+/**
+  * @brief  The assert_param macro is used for function's parameters check.
+  * @param  expr: If expr is false, it calls assert_failed function
+  *         which reports the name of the source file and the source
+  *         line number of the call that failed.
+  *         If expr is true, it returns no value.
+  * @retval None
+  */
+  #include "mbed_assert.h"
+  #define assert_param(expr) MBED_ASSERT(expr)
+
+#endif