Restore capability of enabling parameter assertion of peripheral libraries

Signed-off-by: Marcos Chaparro <[email protected]>

Author: nitrousnrg

ChibiOS_3.0.2/ext/stdperiph_stm32f4/src/misc.c

@@ -75,10 +75,6 @@
 /* Includes ------------------------------------------------------------------*/
 #include "misc.h"
 
-#ifndef assert_param
-#define assert_param(expr) ((void)0)
-#endif
-
 /** @addtogroup STM32F4xx_StdPeriph_Driver
   * @{
   */

ChibiOS_3.0.2/ext/stdperiph_stm32f4/src/stm32f4xx_adc.c

@@ -106,9 +106,6 @@
 #include "stm32f4xx_adc.h"
 #include "stm32f4xx_rcc.h"
 
-#ifndef assert_param
-#define assert_param(expr) ((void)0)
-#endif
 
 /** @addtogroup STM32F4xx_StdPeriph_Driver
   * @{

ChibiOS_3.0.2/ext/stdperiph_stm32f4/src/stm32f4xx_dac.c

@@ -131,10 +131,6 @@
 #include "stm32f4xx_dac.h"
 #include "stm32f4xx_rcc.h"
 
-#ifndef assert_param
-#define assert_param(expr) ((void)0)
-#endif
-
 /** @addtogroup STM32F4xx_StdPeriph_Driver
   * @{
   */

ChibiOS_3.0.2/ext/stdperiph_stm32f4/src/stm32f4xx_dma.c

@@ -124,10 +124,6 @@
 #include "stm32f4xx_dma.h"
 #include "stm32f4xx_rcc.h"
 
-#ifndef assert_param
-#define assert_param(expr) ((void)0)
-#endif
-
 /** @addtogroup STM32F4xx_StdPeriph_Driver
   * @{
   */

ChibiOS_3.0.2/ext/stdperiph_stm32f4/src/stm32f4xx_exti.c

@@ -67,10 +67,6 @@
 /* Includes ------------------------------------------------------------------*/
 #include "stm32f4xx_exti.h"
 
-#ifndef assert_param
-#define assert_param(expr) ((void)0)
-#endif
-
 /** @addtogroup STM32F4xx_StdPeriph_Driver
   * @{
   */

ChibiOS_3.0.2/ext/stdperiph_stm32f4/src/stm32f4xx_flash.c

@@ -83,12 +83,6 @@
 #define FLASH_OPTCR_BFB2                    ((uint32_t)0x00000010)
 #endif
 
-#ifndef assert_param
-#define assert_param(expr) ((void)0)
-#endif
-
-#define STM32F40_41xxx
-
 /** @addtogroup STM32F4xx_StdPeriph_Driver
   * @{
   */

ChibiOS_3.0.2/ext/stdperiph_stm32f4/src/stm32f4xx_iwdg.c

@@ -84,10 +84,6 @@
 /* Includes ------------------------------------------------------------------*/
 #include "stm32f4xx_iwdg.h"
 
-#ifndef assert_param
-#define assert_param(expr) ((void)0)
-#endif
-
 /** @addtogroup STM32F4xx_StdPeriph_Driver
   * @{
   */

ChibiOS_3.0.2/ext/stdperiph_stm32f4/src/stm32f4xx_rcc.c

@@ -74,10 +74,6 @@
 #define  RCC_BDCR_LSEMOD                     ((uint32_t)0x00000008)
 #endif
 
-#ifndef assert_param
-#define assert_param(expr) ((void)0)
-#endif
-
 /** @addtogroup STM32F4xx_StdPeriph_Driver
   * @{
   */
@@ -261,7 +257,7 @@ void RCC_DeInit(void)
   RCC->PLLI2SCFGR = 0x20003000;
 #endif /* STM32F40_41xxx || STM32F427_437xx || STM32F429_439xx || STM32F401xx || STM32F411xE || STM32F446xx || STM32F469_479xx */
 
-#if defined(STM32F40_41xxx) || defined(STM32F427_437xx) || defined(STM32F429_439xx) || defined(STM32F446xx) || defined(STM32F469_479xx) 
+#if defined(STM32F427_437xx) || defined(STM32F429_439xx) || defined(STM32F446xx) || defined(STM32F469_479xx)
   /* Reset PLLSAICFGR register, only available for STM32F42xxx/43xxx/446xx/469xx/479xx devices */
   RCC->PLLSAICFGR = 0x24003000;
 #endif /* STM32F40_41xxx || STM32F427_437xx || STM32F429_439xx || STM32F446xx || STM32F469_479xx */
@@ -827,7 +823,7 @@ void RCC_PLLSAIConfig(uint32_t PLLSAIM, uint32_t PLLSAIN, uint32_t PLLSAIP, uint
 }
 #endif /* STM32F446xx */
 
-#if defined(STM32F40_41xxx) || defined(STM32F427_437xx) || defined(STM32F429_439xx) || defined(STM32F401xx) || defined(STM32F411xE)
+#if defined(STM32F427_437xx) || defined(STM32F429_439xx) || defined(STM32F401xx) || defined(STM32F411xE)
 /**
   * @brief  Configures the PLLSAI clock multiplication and division factors.
   *
@@ -1660,7 +1656,7 @@ void RCC_I2SCLKConfig(uint32_t RCC_I2SCLKSource)
 }
 #endif /* STM32F40_41xxx || STM32F427_437xx || STM32F429_439xx || STM32F401xx || STM32F411xE || STM32F469_479xx */
 
-#if defined(STM32F40_41xxx) || defined(STM32F427_437xx) || defined(STM32F429_439xx) || defined(STM32F469_479xx)
+#if defined(STM32F427_437xx) || defined(STM32F429_439xx) || defined(STM32F469_479xx)
 /**
   * @brief  Configures SAI1BlockA clock source selection.
   * 

ChibiOS_3.0.2/ext/stdperiph_stm32f4/src/stm32f4xx_syscfg.c

@@ -50,10 +50,6 @@
 #include "stm32f4xx_syscfg.h"
 #include "stm32f4xx_rcc.h"
 
-#ifndef assert_param
-#define assert_param(expr) ((void)0)
-#endif
-
 /** @addtogroup STM32F4xx_StdPeriph_Driver
   * @{
   */

ChibiOS_3.0.2/ext/stdperiph_stm32f4/src/stm32f4xx_tim.c

@@ -119,10 +119,6 @@
 #include "stm32f4xx_tim.h"
 #include "stm32f4xx_rcc.h"
 
-#ifndef assert_param
-#define assert_param(expr) ((void)0)
-#endif
-
 /** @addtogroup STM32F4xx_StdPeriph_Driver
   * @{
   */

ChibiOS_3.0.2/ext/stdperiph_stm32f4/src/stm32f4xx_wwdg.c

@@ -84,10 +84,6 @@
 #include "stm32f4xx_wwdg.h"
 #include "stm32f4xx_rcc.h"
 
-#ifndef assert_param
-#define assert_param(expr) ((void)0)
-#endif
-
 /** @addtogroup STM32F4xx_StdPeriph_Driver
   * @{
   */

ChibiOS_3.0.2/os/ext/CMSIS/ST/stm32f4xx.h

@@ -59,7 +59,7 @@
 #ifdef __cplusplus
  extern "C" {
 #endif /* __cplusplus */
-   
+
 /** @addtogroup Library_configuration_section
   * @{
   */
@@ -125,6 +125,29 @@
 #define STM32F407xx
 #endif
 
+#if defined(STM32F439xx) || defined(STM32F429xx)
+#define STM32F429_439xx
+
+#elif defined(STM32F437xx) || defined(STM32F427xx)
+#define STM32F427_437xx
+
+#elif defined(STM32F405xx) || defined(STM32F415xx) ||                       \
+      defined(STM32F407xx) || defined(STM32F417xx)
+#define STM32F40_41xxx
+
+#elif defined(STM32F401xC) || defined(STM32F401xE)
+#define STM32F401xx
+
+#elif defined(STM32F411xE)
+#define STM32F411xx
+
+#elif defined(STM32F2XX)
+
+#else
+#error "STM32F2xx/F4xx device not specified"
+#endif
+
+
 #if defined(STM32F405xx)
   #include "stm32f405xx.h"
 #elif defined(STM32F415xx)
@@ -210,6 +233,32 @@ typedef enum
  #include "stm32f4xx_hal.h"
 #endif /* USE_HAL_DRIVER */
 
+
+/* Uncomment the line below to expanse the "assert_param" macro in the
+   Standard Peripheral Library drivers code */
+//#define USE_FULL_ASSERT    1
+
+/* 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
+  */
+  #define assert_param(expr) ((expr) ? (void)0 : assert_failed((uint8_t *)__FILE__, __LINE__))
+/* Exported functions ------------------------------------------------------- */
+  void assert_failed(uint8_t* file, uint32_t line);
+#else
+  #ifndef assert_param
+    #define assert_param(expr) ((void)0)
+  #endif
+#endif /* USE_FULL_ASSERT */
+
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */

main.c

@@ -176,6 +176,12 @@ static THD_FUNCTION(timer_thread, arg) {
 	}
 }
 
+void assert_failed(uint8_t* file, uint32_t line) {
+	commands_printf("Wrong parameters value: file %s on line %d\r\n", file, line);
+	while(1)
+		;
+}
+
 int main(void) {
 	halInit();
 	chSysInit();

stm32f4xx_conf.h

@@ -15,11 +15,4 @@
 #include "stm32f4xx_wwdg.h"
 #include "stm32f4xx_iwdg.h"
 
-#ifdef  USE_FULL_ASSERT
-#define assert_param(expr) ((expr) ? (void)0 : assert_failed((uint8_t *)__FILE__, __LINE__))
-void assert_failed(uint8_t* file, uint32_t line);
-#else
-#define assert_param(expr) ((void)0)
-#endif
-
 #endif