- Build Event Recorder setup function conditionally.

- Fix build issues for Cortex-A profile.

Author: VladimirUmek

ARM.CMSIS-FreeRTOS.pdsc

@@ -8,6 +8,11 @@
   <license>License/license.txt</license>
 
   <releases>
+    <release version="10.0.2-dev5">
+      CMSIS:RTOS2:FreeRTOS update:
+        - Build Event Recorder setup function conditionally.
+        - Fix build issues for Cortex-A profile.
+    </release>
     <release version="10.0.2-dev4">
       CMSIS:RTOS2:FreeRTOS update:
         - Updated ARM standard C library interface

CMSIS/RTOS2/FreeRTOS/Source/ARM/clib_arm.c

@@ -47,7 +47,9 @@ __WEAK
 void _platform_post_stackheap_init (void);
 void _platform_post_stackheap_init (void) {
   /* Initialize OS, memory, etc. */
-  EvrFreeRTOSSetup(0);
+  #if defined(RTE_Compiler_EventRecorder)
+    EvrFreeRTOSSetup(0);
+  #endif
 }
 #endif /* __MICROLIB */
 
@@ -56,7 +58,9 @@ __WEAK
 void software_init_hook (void);
 void software_init_hook (void) {
   /* Initialize OS, memory, etc. */
-  EvrFreeRTOSSetup(0);
+  #if defined(RTE_Compiler_EventRecorder)
+    EvrFreeRTOSSetup(0);
+  #endif
 }
 
 #endif

CMSIS/RTOS2/FreeRTOS/Source/cmsis_os2.c

@@ -56,8 +56,11 @@
 #define IS_IRQ_MASKED()           ((__get_PRIMASK() != 0U) || ((KernelState == osKernelRunning) && (__get_BASEPRI() != 0U)))
 #elif  (__ARM_ARCH_6M__      == 1U)
 #define IS_IRQ_MASKED()           ((__get_PRIMASK() != 0U) &&  (KernelState == osKernelRunning))
-#elif (__ARM_ARCH_7A__       == 1)
-#define IS_IRQ_MASKED()           (0U)
+#elif (__ARM_ARCH_7A__       == 1U)
+/* CPSR mask bits */
+#define CPSR_MASKBIT_I            0x80U
+
+#define IS_IRQ_MASKED()           ((__get_CPSR() & CPSR_MASKBIT_I) != 0U)
 #else
 #define IS_IRQ_MASKED()           (__get_PRIMASK() != 0U)
 #endif
@@ -169,7 +172,9 @@ osStatus_t osKernelInitialize (void) {
   }
   else {
     if (KernelState == osKernelInactive) {
-      EvrFreeRTOSSetup(0U);
+      #if defined(RTE_Compiler_EventRecorder)
+        EvrFreeRTOSSetup(0U);
+      #endif
       #if defined(RTE_RTOS_FreeRTOS_HEAP_5) && (HEAP_5_REGION_SETUP == 1)
         vPortDefineHeapRegions (configHEAP_5_REGIONS);
       #endif
@@ -356,7 +361,7 @@ uint32_t osKernelGetTickFreq (void) {
 }
 
 uint32_t osKernelGetSysTimerCount (void) {
-  uint32_t primask = __get_PRIMASK();
+  uint32_t irqmask = IS_IRQ_MASKED();
   TickType_t ticks;
   uint32_t val;
 
@@ -371,7 +376,7 @@ uint32_t osKernelGetSysTimerCount (void) {
   }
   val += ticks * OS_Tick_GetInterval();
 
-  if (primask == 0U) {
+  if (irqmask == 0U) {
     __enable_irq();
   }
 
@@ -840,10 +845,12 @@ osStatus_t osDelayUntil (uint32_t ticks) {
   else {
     stat = osOK;
     tcnt = xTaskGetTickCount();
+
+    /* Determine remaining number of ticks to delay */
     delay = (TickType_t)ticks - tcnt;
 
-    /* check if target tick has not expired */
-    if(delay && 0 == (delay >> (8 * sizeof(TickType_t) - 1))){
+    /* Check if target tick has not expired */
+    if((delay != 0U) && (0 == (delay >> (8 * sizeof(TickType_t) - 1)))) {
       vTaskDelayUntil (&tcnt, delay);
     }
     else

CMSIS/RTOS2/FreeRTOS/Source/freertos_evr.c

@@ -1,5 +1,5 @@
 /* --------------------------------------------------------------------------
- * Copyright (c) 2013-2018 Arm Limited. All rights reserved.
+ * Copyright (c) 2013-2019 Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -196,8 +196,6 @@
 #define EvtFreeRTOSStreamBuf_StreamBufferReceiveFailed      EventID(EventLevelError,  EvtFreeRTOSStreamBufNo, 0x0BU)
 #define EvtFreeRTOSStreamBuf_StreamBufferReceiveFromIsr     EventID(EventLevelOp,     EvtFreeRTOSStreamBufNo, 0x0CU)
 
-#endif /* RTE_Compiler_EventRecorder */
-
 /* Event Recorder initialization and level filter setup */
 void EvrFreeRTOSSetup (uint32_t reset) {
 #if !defined(EVR_FREERTOS_DISABLE)
@@ -229,6 +227,8 @@ void EvrFreeRTOSSetup (uint32_t reset) {
 #endif
 }
 
+#endif /* RTE_Compiler_EventRecorder */
+
 /* Tasks */
 
 #if (!defined(EVR_FREERTOS_DISABLE) && !defined(traceTASK_CREATE_DISABLE))
@@ -971,7 +971,7 @@ void EvrFreeRTOSStreamBuf_StreamBufferCreateFailed (uint32_t uxIsMessageBuffer)
 #if defined(RTE_Compiler_EventRecorder)
   EventRecord2(EvtFreeRTOSStreamBuf_StreamBufferCreateFailed, (uint32_t)uxIsMessageBuffer, 0U);
 #else
-  (void)pxStreamBuffer;
+  (void)uxIsMessageBuffer;
 #endif
 }
 #endif