Manage CMSIS_RTOS versions

Move CMSIS_RTOS* to portable.
Add source and header files wrappers.
Add new custom definition to use CMSIS-RTOSv2.

Important note: no support will be provided for this configuration.

Signed-off-by: Frederic.Pillon <frederic.pillon@st.com>

Author: fpistm

src/FreeRTOS/Source/CMSIS_RTOS/cmsis_os.c renamed to portable/CMSIS_RTOS/cmsis_os.c

@@ -118,6 +118,8 @@ static HeapRegion_t xHeapRegions[] = {
 /* FreeRTOS tick timer interrupt handler prototype */
 extern void xPortSysTickHandler (void);
 
+/* SysTick handler implementation done in the core and call osSystickHandler */
+#ifndef ARDUINO_ARCH_STM32
 /*
   SysTick handler implementation that also clears overflow flag.
 */
@@ -128,6 +130,7 @@ void SysTick_Handler (void) {
   /* Call tick handler */
   xPortSysTickHandler();
 }
+#endif
 #endif /* SysTick */
 
 /*---------------------------------------------------------------------------*/

src/FreeRTOS/Source/CMSIS_RTOS/cmsis_os.h renamed to portable/CMSIS_RTOS/cmsis_os.h

@@ -48,30 +48,63 @@
  * Default -1 see heap.c
  */
 /*#define configMEMMANG_HEAP_NB             3*/
+
+/* configUSE_CMSIS_RTOS_V2 has to be defined and set to 1 to use CMSIS-RTOSv2 */
+/*#define configUSE_CMSIS_RTOS_V2           1*/
+
 /* End custom definitions for STM32 */
 
 /* Ensure stdint is only used by the compiler, and not the assembler. */
 #if defined(__ICCARM__) || defined(__CC_ARM) || defined(__GNUC__)
  #include <stdint.h>
  extern uint32_t SystemCoreClock;
 #endif
+
+#if defined(configUSE_CMSIS_RTOS_V2) && (configUSE_CMSIS_RTOS_V2 == 1)
+/*------------- CMSIS-RTOS V2 specific defines -----------*/
+/* When using CMSIS-RTOSv2 set configSUPPORT_STATIC_ALLOCATION to 1
+ * is mandatory to avoid compile errors.
+ * CMSIS-RTOS V2 implmentation requires the following defines
+ */
+/* cmsis_os threads are created using xTaskCreateStatic() API */
+#define configSUPPORT_STATIC_ALLOCATION   1
+/*  CMSIS-RTOSv2 defines 56 levels of priorities. To be able to use them
+ *  all and avoid application misbehavior, configUSE_PORT_OPTIMISED_TASK_SELECTION
+ *  must be set to 0 and configMAX_PRIORITIES to 56
+ *
+ */
+#define configMAX_PRIORITIES              (56)
+/*
+ * When set to 1, configMAX_PRIORITIES can't be more than 32
+ * which is not suitable for the new CMSIS-RTOS v2 priority range
+ */
+#define configUSE_PORT_OPTIMISED_TASK_SELECTION 0
+
+#define configMINIMAL_STACK_SIZE          ((uint16_t)128)
+#define configTOTAL_HEAP_SIZE             ((size_t)(15 * 1024))
+
+#else
 extern char _end; /* Defined in the linker script */
 extern char _estack; /* Defined in the linker script */
 extern char _Min_Stack_Size; /* Defined in the linker script */
 
-#define configUSE_PREEMPTION              1
-#define configUSE_IDLE_HOOK               1
-#define configUSE_TICK_HOOK               1
-#define configCPU_CLOCK_HZ                (SystemCoreClock)
-#define configTICK_RATE_HZ                ((TickType_t)1000)
 #define configMAX_PRIORITIES              (7)
+
 /*
  * _Min_Stack_Size is often set to 0x400 in the linker script
  * Use it divided by 8 to set minmimal stack size of a task to 128 by default.
  * End user will have to properly configure those value depending to their needs.
  */
 #define configMINIMAL_STACK_SIZE          ((uint16_t)((uint32_t)&_Min_Stack_Size/8))
 #define configTOTAL_HEAP_SIZE             ((size_t)(&_estack - _Min_Stack_Size - &_end))
+
+#endif /* configUSE_CMSIS_RTOS_V2 */
+
+#define configUSE_PREEMPTION              1
+#define configUSE_IDLE_HOOK               1
+#define configUSE_TICK_HOOK               1
+#define configCPU_CLOCK_HZ                (SystemCoreClock)
+#define configTICK_RATE_HZ                ((TickType_t)1000)
 #define configMAX_TASK_NAME_LEN           (16)
 #define configUSE_TRACE_FACILITY          1
 #define configUSE_16_BIT_TICKS            0
@@ -154,9 +187,18 @@ header file. */
 #define vPortSVCHandler    SVC_Handler
 #define xPortPendSVHandler PendSV_Handler
 
-/* IMPORTANT: This define MUST be commented when used with STM32Cube firmware,
-              to prevent overwriting SysTick_Handler defined within STM32Cube HAL */
+/*
+ * IMPORTANT:
+ * osSystickHandler is called in the core SysTick_Handler definition
+ * and is defined as weak.
+ * For CMSIS-RTOSv2: osSystickHandler is defined as xPortSysTickHandler
+ * For CMSIS-RTOS: osSystickHandler is defined by the cmsis_os and xPortSysTickHandler
+ * must not be defined to prevent overwriting SysTick_Handler
+ */
 /* #define xPortSysTickHandler SysTick_Handler */
+#if defined(configUSE_CMSIS_RTOS_V2) && (configUSE_CMSIS_RTOS_V2 == 1)
+#define xPortSysTickHandler osSystickHandler
+#endif
 
 #endif /* FREERTOS_CONFIG_H */
 

src/FreeRTOS/Source/CMSIS_RTOS_V2/cmsis_os.h renamed to portable/CMSIS_RTOS_V2/cmsis_os.h

@@ -0,0 +1,14 @@
+/*
+ * @file    cmsis_os.c
+ * @author  Frederic Pillon <frederic.pillon@st.com> for STMicroelectronics.
+ * @brief   Include source of FreeRTOS portable layer file to match Arduino library format
+ */
+#include "FreeRTOS.h"
+
+#if !defined(configUSE_CMSIS_RTOS_V2) || (configUSE_CMSIS_RTOS_V2 == 0)
+#include "../portable/CMSIS_RTOS/cmsis_os.c"
+#else
+#include "../portable/CMSIS_RTOS_V2/cmsis_os1.c"
+#include "../portable/CMSIS_RTOS_V2/cmsis_os2.c"
+#endif
+

src/FreeRTOS/Source/CMSIS_RTOS_V2/cmsis_os1.c renamed to portable/CMSIS_RTOS_V2/cmsis_os1.c

@@ -6,6 +6,12 @@
 #ifndef _ARDUINO_CMSIS_OS_H_
 #define _ARDUINO_CMSIS_OS_H_
 
-#include "FreeRTOS/Source/CMSIS_RTOS/cmsis_os.h"
+#include "FreeRTOS.h"
+
+#if !defined(configUSE_CMSIS_RTOS_V2) || (configUSE_CMSIS_RTOS_V2 == 0)
+#include "../portable/CMSIS_RTOS/cmsis_os.h"
+#else
+#include "../portable/CMSIS_RTOS_V2/cmsis_os.h"
+#endif
 
 #endif //_ARDUINO_CMSIS_OS_H_