Identified problems fixed

Author: VladimirUmek

ARM.CMSIS-FreeRTOS.pdsc

@@ -8,7 +8,7 @@
   <license>License/license.txt</license>
 
   <releases>
-    <release version="10.2.0-RC">
+    <release version="10.2.0-RC1">
       FreeRTOS 10.2.0
       Maintenance for CMSIS 5.5.1:
       - Updated to CMSIS API 2.1.3

CMSIS/RTOS2/FreeRTOS/Source/cmsis_os2.c

@@ -53,9 +53,9 @@
 #if   ((__ARM_ARCH_7M__      == 1U) || \
        (__ARM_ARCH_7EM__     == 1U) || \
        (__ARM_ARCH_8M_MAIN__ == 1U))
-#define IS_IRQ_MASKED()           ((KernelState == osKernelRunning) && ((__get_PRIMASK() != 0U) || (__get_BASEPRI() != 0U)))
+#define IS_IRQ_MASKED()           ((__get_PRIMASK() != 0U) || (__get_BASEPRI() != 0U))
 #elif  (__ARM_ARCH_6M__      == 1U)
-#define IS_IRQ_MASKED()           ((KernelState == osKernelRunning) && (__get_PRIMASK() != 0U))
+#define IS_IRQ_MASKED()           (__get_PRIMASK() != 0U)
 #elif (__ARM_ARCH_7A__       == 1U)
 /* CPSR mask bits */
 #define CPSR_MASKBIT_I            0x80U
@@ -75,7 +75,7 @@
 #define IS_IRQ_MODE()             (__get_IPSR() != 0U)
 #endif
 
-#define IS_IRQ()                  (IS_IRQ_MODE() || IS_IRQ_MASKED())
+#define IS_IRQ()                  (IS_IRQ_MODE() || (IS_IRQ_MASKED() && (KernelState == osKernelRunning)))
 
 /* Limits */
 #define MAX_BITS_TASK_NOTIFY      31U
@@ -164,6 +164,18 @@ void SysTick_Handler (void) {
 }
 #endif /* SysTick */
 
+/*
+  Setup SVC to reset value.
+*/
+__STATIC_INLINE void SVC_Setup (void) {
+#if (__ARM_ARCH_7A__ == 0U)
+  /* Service Call interrupt might be configured before kernel start     */
+  /* and when its priority is lower or equal to BASEPRI, svc intruction */
+  /* causes a Hard Fault.                                               */
+  NVIC_SetPriority (SVCall_IRQn, 0U);
+#endif
+}
+
 /*---------------------------------------------------------------------------*/
 
 osStatus_t osKernelInitialize (void) {
@@ -242,7 +254,7 @@ osStatus_t osKernelStart (void) {
   else {
     if (KernelState == osKernelReady) {
       /* Ensure SVC priority is at the reset value */
-      NVIC_SetPriority (SVCall_IRQn, 0U);
+      SVC_Setup();
       /* Change state to enable IRQ masking check */
       KernelState = osKernelRunning;
       /* Start the kernel scheduler */
@@ -368,11 +380,11 @@ uint32_t osKernelGetTickFreq (void) {
 }
 
 uint32_t osKernelGetSysTimerCount (void) {
-  uint32_t irqmask;
+  uint32_t irqmask = IS_IRQ_MASKED();
   TickType_t ticks;
   uint32_t val;
 
-  irqmask = __disable_irq();
+  __disable_irq();
 
   ticks = xTaskGetTickCount();
   val   = OS_Tick_GetCount();

Config/ARMCA/FreeRTOSConfig.h

@@ -49,7 +49,7 @@
 #define configTOTAL_HEAP_SIZE                 ((size_t)4096)
 #define configMINIMAL_STACK_SIZE              ((uint16_t)256)
 #define configSUPPORT_DYNAMIC_ALLOCATION      1
-#define configSUPPORT_STATIC_ALLOCATION       1
+#define configSUPPORT_STATIC_ALLOCATION       0
 
 /* Constants related to the behaviour or the scheduler. */
 #define configMAX_PRIORITIES                  5
@@ -60,7 +60,7 @@
 #define configUSE_16_BIT_TICKS                0
 
 /* Software timer definitions. */
-#define configUSE_TIMERS                      1
+#define configUSE_TIMERS                      0
 #define configTIMER_TASK_PRIORITY             2
 #define configTIMER_QUEUE_LENGTH              5
 #define configTIMER_TASK_STACK_DEPTH          (configMINIMAL_STACK_SIZE * 2)

Config/ARMCM/FreeRTOSConfig.h

@@ -51,7 +51,7 @@ extern uint32_t SystemCoreClock;
 #define configTOTAL_HEAP_SIZE                 ((size_t)4096)
 #define configMINIMAL_STACK_SIZE              ((uint16_t)256)
 #define configSUPPORT_DYNAMIC_ALLOCATION      1
-#define configSUPPORT_STATIC_ALLOCATION       1
+#define configSUPPORT_STATIC_ALLOCATION       0
 
 /* Constants related to the behaviour or the scheduler. */
 #define configMAX_PRIORITIES                  5
@@ -62,7 +62,7 @@ extern uint32_t SystemCoreClock;
 #define configUSE_16_BIT_TICKS                0
 
 /* Software timer definitions. */
-#define configUSE_TIMERS                      1
+#define configUSE_TIMERS                      0
 #define configTIMER_TASK_PRIORITY             2
 #define configTIMER_QUEUE_LENGTH              5
 #define configTIMER_TASK_STACK_DEPTH          (configMINIMAL_STACK_SIZE * 2)