Fix SysTick_Handler definition for CM33 and CMSIS V2

SysTick_Handler() from stm32duino core is calling weak osSystickHandler().
Both CMSIS-RTOSv2 and CMSIS-RTOS override osSystickHandler()
which is calling xPortSysTickHandler(), defined in respective CortexM-x port

Note: It is necessary to go through this function
(osSystickHandler()) that checks whether scheduler is started
otherwise there are issue when systick interrupt fires before FreeRTOS is started

Signed-off-by: Alexandre Bourdiol <[email protected]>

Author: fpistm

README.md

@@ -111,6 +111,8 @@ 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 F103RB (Cortex-M3)](http://www.st.com/en/evaluation-tools/nucleo-f103rb.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 |
+| [Nucleo L552ZE-Q (Cortex-M33)](https://www.st.com/en/evaluation-tools/nucleo-l552ze-q.html) | PASSED | PASSED | PASSED | PASSED | PASSED |
+| [Nucleo U575ZI-Q (Cortex-M33)](https://www.st.com/en/evaluation-tools/nucleo-u575zi-q.html) | PASSED | PASSED | PASSED | PASSED | PASSED |

portable/CMSIS_RTOS_V2/cmsis_os2.c

@@ -156,8 +156,8 @@ extern void xPortSysTickHandler (void);
   SysTick handler implementation that also clears overflow flag.
 */
 /* SysTick handler implementation done in the core and call osSystickHandler */
-#if !defined(ARDUINO_ARCH_STM32) && (USE_CUSTOM_SYSTICK_HANDLER_IMPLEMENTATION == 0)
-void SysTick_Handler (void) {
+#if (USE_CUSTOM_SYSTICK_HANDLER_IMPLEMENTATION == 0)
+void osSystickHandler (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 /* USE_CUSTOM_SYSTICK_HANDLER_IMPLEMENTATION == 0*/
 #endif /* SysTick */
 
 /*

portable/GCC/ARM_CM33_NTZ/non_secure/port.c

@@ -333,7 +333,9 @@ void vPortExitCritical( void ) PRIVILEGED_FUNCTION;
 /**
  * @brief SysTick handler.
  */
-void SysTick_Handler( void ) PRIVILEGED_FUNCTION;
+/* Fix for STM32 core */
+/* void SysTick_Handler( void ) PRIVILEGED_FUNCTION; */
+void xPortSysTickHandler( void ) PRIVILEGED_FUNCTION;
 
 /**
  * @brief C part of SVC handler.
@@ -733,7 +735,9 @@ void vPortExitCritical( void ) /* PRIVILEGED_FUNCTION */
 }
 /*-----------------------------------------------------------*/
 
-void SysTick_Handler( void ) /* PRIVILEGED_FUNCTION */
+/* Fix for STM32 core */
+/* void SysTick_Handler( void ) */ /* PRIVILEGED_FUNCTION */
+void xPortSysTickHandler( void ) /* PRIVILEGED_FUNCTION */
 {
 uint32_t ulPreviousMask;
 

src/FreeRTOSConfig_Default.h

@@ -215,15 +215,11 @@ header file. */
 
 /*
  * 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
+ * SysTick_Handler() from stm32duino core is calling weak osSystickHandler().
+ * Both CMSIS-RTOSv2 and CMSIS-RTOS override osSystickHandler() 
+ * which is calling xPortSysTickHandler(), defined in respective CortexM-x port
  */
 /* #define xPortSysTickHandler SysTick_Handler */
-#if defined(configUSE_CMSIS_RTOS_V2) && (configUSE_CMSIS_RTOS_V2 == 1)
-#define xPortSysTickHandler osSystickHandler
-#endif
 
 #endif /* FREERTOS_CONFIG_DEFAULT_H */