Fix CMSIS_RTOS_V2 compilation issue (FreeRTOS 10.3.1)

ABOSTM · ABOSTM · commit 08a4e9ce93ea · 2022-02-14T18:25:06.000+01:00
* CMSIS_device_header must be defined.
* Some Includes define must be set

Signed-off-by: Alexandre Bourdiol &lt;alexandre.bourdiol@st.com&gt;
diff --git a/README.md b/README.md
@@ -105,3 +105,12 @@ CMSIS-RTOSv2.
 | [P-Nucleo-WB55RG](https://www.st.com/en/evaluation-tools/p-nucleo-wb55.html) | PASSED | PASSED | FAILED | PASSED | PASSED |
 
 \* PASSED with `configUSE_NEWLIB_REENTRANT` set to 0 due to small RAM.
+
+### STM32FreeRTOS v10.3.1
+| Board | AnalogRead_DigitalRead | frBlinkPrint | frLiuLayland | frBlink (CMSIS-RTOSv2) | Blinky (CMSIS-RTOSv2) |
+| --- | :---: | :---: | :---: | :---: | :---: |
+| [Nucleo F091RC (Cortex-M0)](http://www.st.com/en/evaluation-tools/nucleo-f091rc.html) | PASSED | PASSED | FAILED | PASSED | PASSED |
+| [Nucleo G071RB (Cortex-M0+)](http://www.st.com/en/evaluation-tools/nucleo-g071rb.html) | PASSED | PASSED | FAILED | PASSED | PASSED |
+| [Nucleo L476RG (Cortex-M3)](http://www.st.com/en/evaluation-tools/nucleo-l476rg.html) | PASSED | PASSED | PASSED | PASSED | PASSED |
+| [Nucleo L476RG (Cortex-M4)](http://www.st.com/en/evaluation-tools/nucleo-l476rg.html) | PASSED | PASSED | PASSED | PASSED | PASSED |
+| [Nucleo H743ZI (Cortex-M7)](https://www.st.com/en/evaluation-tools/nucleo-h743zi.html) | PASSED | PASSED | PASSED | PASSED | PASSED |
diff --git a/portable/CMSIS_RTOS_V2/cmsis_os2.c b/portable/CMSIS_RTOS_V2/cmsis_os2.c
@@ -156,7 +156,7 @@ extern void xPortSysTickHandler (void);
   SysTick handler implementation that also clears overflow flag.
 */
 /* SysTick handler implementation done in the core and call osSystickHandler */
-#ifndef ARDUINO_ARCH_STM32 && (USE_CUSTOM_SYSTICK_HANDLER_IMPLEMENTATION == 0)
+#if !defined(ARDUINO_ARCH_STM32) && (USE_CUSTOM_SYSTICK_HANDLER_IMPLEMENTATION == 0)
 void SysTick_Handler (void) {
   /* Clear overflow flag */
   SysTick->CTRL;
@@ -166,7 +166,7 @@ void SysTick_Handler (void) {
     xPortSysTickHandler();
   }
 }
-#endif /* ARDUINO_ARCH_STM32 && USE_CUSTOM_SYSTICK_HANDLER_IMPLEMENTATION == 0*/
+#endif /* !ARDUINO_ARCH_STM32 && (USE_CUSTOM_SYSTICK_HANDLER_IMPLEMENTATION == 0)*/
 #endif /* SysTick */
 
 /*
diff --git a/src/FreeRTOSConfig_Default.h b/src/FreeRTOSConfig_Default.h
@@ -83,6 +83,11 @@
 #ifndef configMINIMAL_STACK_SIZE
 #define configMINIMAL_STACK_SIZE          ((uint16_t)128)
 #endif
+
+#if !defined(CMSIS_device_header)
+/* CMSIS_device_header defined to stm32_def.h by default, which include <device.h> like stm32f1xx.h */
+#define CMSIS_device_header  "stm32_def.h"
+#endif /* CMSIS_device_header */
 #else
 #define configMAX_PRIORITIES              (7)
 #endif /* configUSE_CMSIS_RTOS_V2 */
@@ -158,6 +163,13 @@ to exclude the API function. */
 #define INCLUDE_uxTaskGetStackHighWaterMark 1
 #define INCLUDE_xTaskGetIdleTaskHandle 1
 
+#if defined(configUSE_CMSIS_RTOS_V2) && (configUSE_CMSIS_RTOS_V2 == 1)
+#define INCLUDE_xSemaphoreGetMutexHolder  1
+#define INCLUDE_eTaskGetState             1
+#define INCLUDE_xTimerPendFunctionCall    1
+#define INCLUDE_xTaskGetCurrentTaskHandle 1
+#endif
+
 /* Cortex-M specific definitions. */
 #ifdef __NVIC_PRIO_BITS
  /* __BVIC_PRIO_BITS will be specified when CMSIS is being used. */
