- ARM standard C library interface updated

- EvrFreeRTOSSetup: reset option added

Author: VladimirUmek

ARM.CMSIS-FreeRTOS.pdsc

@@ -8,6 +8,10 @@
   <license>License/license.txt</license>
 
   <releases>
+    <release version="10.0.2-dev4">
+      CMSIS:RTOS2:FreeRTOS update:
+        - Updated ARM standard C library interface
+    </release>
     <release version="10.0.2-dev3">
       CMSIS:RTOS2:FreeRTOS update:
         - Added Event Recorder configuration

CMSIS/RTOS2/FreeRTOS/Examples/Native_Blinky/Blinky.c

@@ -132,7 +132,7 @@ void app_main (void *argument) {
 int main (void) {
   SystemCoreClockUpdate();
 
-  EvrFreeRTOSSetup();
+  EvrFreeRTOSSetup(0);
 
   xTaskCreate (app_main, "app_main", 64, NULL, tskIDLE_PRIORITY+1, NULL);
 

CMSIS/RTOS2/FreeRTOS/Include/freertos_evr.h

@@ -45,8 +45,9 @@
 
 /**
   \brief  Setup Event Recorder configuration
+  \param[in]  reset             reset if already configured (0:no reset, 1:reset)
 */
-extern void EvrFreeRTOSSetup (void);
+extern void EvrFreeRTOSSetup (uint32_t reset);
 
 /**
   \brief  Event on successful task create (Op)

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

@@ -1,5 +1,5 @@
 /* -------------------------------------------------------------------------- 
- * Copyright (c) 2013-2017 Arm Limited. All rights reserved.
+ * Copyright (c) 2013-2019 Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -23,32 +23,40 @@
 #include <stdint.h>
 #include <stddef.h>
 
-#include "cmsis_os2.h"
-#include "cmsis_compiler.h"
+#include "FreeRTOS.h"                   // ARM.FreeRTOS::RTOS:Core
+#include "task.h"                       // ARM.FreeRTOS::RTOS:Core
+#include "semphr.h"                     // ARM.FreeRTOS::RTOS:Core
 
 /* Define the number of Threads which use standard C/C++ library libspace */
 #ifndef OS_THREAD_LIBSPACE_NUM
   #define OS_THREAD_LIBSPACE_NUM      4
 #endif
 
+/* Define the number of Mutexes used by standard C/C++ library for stream protection */
+#ifndef OS_MUTEX_CLIB_NUM
+  #define OS_MUTEX_CLIB_NUM           5
+#endif
+
 /*----------------------------------------------------------------------------*/
 
-/* Initialize OS */
+/* Initialization after stack and heap setup */
 #if defined(__CC_ARM) || (defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050))
 
 #ifndef __MICROLIB
 __WEAK
 void _platform_post_stackheap_init (void);
 void _platform_post_stackheap_init (void) {
-  osKernelInitialize();
+  /* Initialize OS, memory, etc. */
+  EvrFreeRTOSSetup(0);
 }
 #endif /* __MICROLIB */
 
 #elif defined(__GNUC__)
 __WEAK
 void software_init_hook (void);
 void software_init_hook (void) {
-  osKernelInitialize();
+  /* Initialize OS, memory, etc. */
+  EvrFreeRTOSSetup(0);
 }
 
 #endif
@@ -64,14 +72,14 @@ void software_init_hook (void) {
 static uint32_t os_libspace[OS_THREAD_LIBSPACE_NUM+1][LIBSPACE_SIZE/sizeof(uint32_t)];
 
 /* Array of Threads (IDs) using libspace */
-static osThreadId_t os_libspace_id[OS_THREAD_LIBSPACE_NUM];
+static TaskHandle_t os_libspace_id[OS_THREAD_LIBSPACE_NUM];
 
 /* OS Kernel state checking */
 static uint32_t os_kernel_is_active (void) {
   static uint8_t os_kernel_active = 0U;
 
   if (os_kernel_active == 0U) {
-    if (osKernelGetState() > osKernelReady) {
+    if (xTaskGetSchedulerState() != taskSCHEDULER_NOT_STARTED) {
       os_kernel_active = 1U;
       return 1U;
     }
@@ -82,18 +90,22 @@ static uint32_t os_kernel_is_active (void) {
 }
 
 /* Provide libspace for current thread */
+void *__user_perthread_libspace (void);
 void *__user_perthread_libspace (void) {
-  osThreadId_t id;
+  TaskHandle_t id;
   uint32_t     n;
 
   if (!os_kernel_is_active()) {
     return (void *)&os_libspace[OS_THREAD_LIBSPACE_NUM][0];
   }
 
-  id = osThreadGetId();
+  id = xTaskGetCurrentTaskHandle();
+
   for (n = 0U; n < OS_THREAD_LIBSPACE_NUM; n++) {
     if (os_libspace_id[n] == NULL) {
+
       os_libspace_id[n] = id;
+
       return (void *)&os_libspace[n][0];
     }
     if (os_libspace_id[n] == id) {
@@ -106,6 +118,11 @@ void *__user_perthread_libspace (void) {
 
 /*----------------------------------------------------------------------------*/
 
+#if (OS_MUTEX_CLIB_NUM > 0)
+static StaticSemaphore_t clib_mutex_cb[OS_MUTEX_CLIB_NUM];
+static SemaphoreHandle_t clib_mutex_id[OS_MUTEX_CLIB_NUM];
+#endif
+
 /* Define mutex object and function prototypes */
 typedef void *mutex;
 
@@ -117,7 +134,30 @@ __USED void _mutex_free      (mutex *m);
 
 /* Initialize mutex */
 int _mutex_initialize(mutex *m) {
-  *m = osMutexNew(NULL);
+#if (OS_MUTEX_CLIB_NUM > 0)
+  uint32_t i;
+#endif
+
+  *m = NULL;
+
+#if (OS_MUTEX_CLIB_NUM > 0)
+  for (i = 0U; i < OS_MUTEX_CLIB_NUM; i++) {
+    if (clib_mutex_id[i] == NULL) {
+      /* Create mutex using static memory */
+      clib_mutex_id[i] = xSemaphoreCreateMutexStatic(&clib_mutex_cb[i]);
+
+      /* Return mutex id */
+      *m = clib_mutex_id[i];
+
+      return 1;
+    }
+  }
+#endif
+  if (os_kernel_is_active()) {
+    /* Create mutex using dynamic memory */
+    *m = xSemaphoreCreateMutex();
+  }
+
   if (*m == NULL) {
     return 0;
   }
@@ -126,21 +166,37 @@ int _mutex_initialize(mutex *m) {
 
 /* Acquire mutex */
 void _mutex_acquire(mutex *m) {
+
   if (os_kernel_is_active()) {
-    osMutexAcquire(*m, osWaitForever);
+    xSemaphoreTake(*m, portMAX_DELAY);
   }
 }
 
 /* Release mutex */
 void _mutex_release(mutex *m) {
+
   if (os_kernel_is_active()) {
-    osMutexRelease(*m);
+    xSemaphoreGive(*m);
   }
 }
 
-/* // Free mutex */
+/* Free mutex */
 void _mutex_free(mutex *m) {
-  osMutexDelete(*m);
+#if (OS_MUTEX_CLIB_NUM > 0)
+  uint32_t i;
+#endif
+
+  vSemaphoreDelete(*m);
+
+#if (OS_MUTEX_CLIB_NUM > 0)
+  /* Check if mutex was using static memory */
+  for (i = 0U; i < OS_MUTEX_CLIB_NUM; i++) {
+    if (*m == clib_mutex_id[i]) {
+      clib_mutex_id[i] = NULL;
+      break;
+    }
+  }
+#endif
 }
 
 #endif

CMSIS/RTOS2/FreeRTOS/Source/cmsis_os2.c

@@ -95,7 +95,7 @@ typedef struct {
 } TimerCallback_t;
 
 /* Kernel initialization state */
-static osKernelState_t KernelState;
+static osKernelState_t KernelState = osKernelInactive;
 
 /*
   Heap region definition used by heap_5 variant
@@ -169,7 +169,7 @@ osStatus_t osKernelInitialize (void) {
   }
   else {
     if (KernelState == osKernelInactive) {
-      EvrFreeRTOSSetup();
+      EvrFreeRTOSSetup(0U);
       #if defined(RTE_RTOS_FreeRTOS_HEAP_5) && (HEAP_5_REGION_SETUP == 1)
         vPortDefineHeapRegions (configHEAP_5_REGIONS);
       #endif

CMSIS/RTOS2/FreeRTOS/Source/freertos_evr.c

@@ -199,22 +199,33 @@
 #endif /* RTE_Compiler_EventRecorder */
 
 /* Event Recorder initialization and level filter setup */
-void EvrFreeRTOSSetup (void) {
+void EvrFreeRTOSSetup (uint32_t reset) {
 #if !defined(EVR_FREERTOS_DISABLE)
-  #if (configEVR_INITIALIZE != 0)
-    EventRecorderInitialize(EVR_INIT_RECORDING, EVR_INIT_START);
-  #endif
-
-  #if (configEVR_SETUP_LEVEL != 0)
-    EventRecorderEnable(configEVR_LEVEL_TASKS,        EvtFreeRTOSTasksNo,       EvtFreeRTOSTasksNo);
-    EventRecorderEnable(configEVR_LEVEL_QUEUE,        EvtFreeRTOSQueueNo,       EvtFreeRTOSQueueNo);
-    EventRecorderEnable(configEVR_LEVEL_TIMERS,       EvtFreeRTOSTimersNo,      EvtFreeRTOSTimersNo);
-    EventRecorderEnable(configEVR_LEVEL_EVENTGROUPS,  EvtFreeRTOSEventGroupsNo, EvtFreeRTOSEventGroupsNo);
-    EventRecorderEnable(configEVR_LEVEL_HEAP,         EvtFreeRTOSHeapNo,        EvtFreeRTOSHeapNo);
-    EventRecorderEnable(configEVR_LEVEL_STREAMBUFFER, EvtFreeRTOSStreamBufNo,   EvtFreeRTOSStreamBufNo);
-  #endif
-
-  EventRecord2(EvtFreeRTOSTasks_TaskTrackingReset, 0U, 0U);
+  static uint8_t init = 0U;
+
+  if (reset != 0U) {
+    init = 0U;
+  }
+
+  if (init == 0U) {
+    init = 1U;
+    #if (configEVR_INITIALIZE != 0)
+      EventRecorderInitialize(EVR_INIT_RECORDING, EVR_INIT_START);
+    #endif
+
+    #if (configEVR_SETUP_LEVEL != 0)
+      EventRecorderEnable(configEVR_LEVEL_TASKS,        EvtFreeRTOSTasksNo,       EvtFreeRTOSTasksNo);
+      EventRecorderEnable(configEVR_LEVEL_QUEUE,        EvtFreeRTOSQueueNo,       EvtFreeRTOSQueueNo);
+      EventRecorderEnable(configEVR_LEVEL_TIMERS,       EvtFreeRTOSTimersNo,      EvtFreeRTOSTimersNo);
+      EventRecorderEnable(configEVR_LEVEL_EVENTGROUPS,  EvtFreeRTOSEventGroupsNo, EvtFreeRTOSEventGroupsNo);
+      EventRecorderEnable(configEVR_LEVEL_HEAP,         EvtFreeRTOSHeapNo,        EvtFreeRTOSHeapNo);
+      EventRecorderEnable(configEVR_LEVEL_STREAMBUFFER, EvtFreeRTOSStreamBufNo,   EvtFreeRTOSStreamBufNo);
+    #endif
+
+    EventRecord2(EvtFreeRTOSTasks_TaskTrackingReset, 0U, 0U);
+  }
+#else
+  (void)reset;
 #endif
 }
 

DoxyGen/General/src/cmsis_freertos.txt

@@ -56,6 +56,28 @@ File/Directory             |Content
 \page cm_revisionHistory Revision History 
 
 <table class="cmtable" summary="Revision History">
+    <tr>
+      <td>10.0.2-dev4</td>
+      <td>
+        <p><b>FreeRTOS V10.1.1</b></p>
+        <p>Maintenance release for CMSIS 5.4.0:
+        <ul>
+          <li>Updated ARM standard C library interface</li>
+          <li>Added reset option for \ref EvrFreeRTOSSetup</li>
+        </ul>
+      </td>
+    </tr>
+    <tr>
+      <td>10.0.2-dev3</td>
+      <td>
+        <p><b>FreeRTOS V10.1.1</b></p>
+        <p>Maintenance release for CMSIS 5.4.0:
+        <ul>
+          <li>Added Event Recorder configuration</li>
+          <li>Corrected CMSIS-FreeRTOS component viewer linked list processing</li>
+        </ul>
+      </td>
+    </tr>
     <tr>
       <td>10.0.2-dev2</td>
       <td>

DoxyGen/General/src/freertos_evr.txt

@@ -14,10 +14,12 @@ The steps are described under \ref cre_freertos_proj.
 */
 
 /**
-\fn void EvrFreeRTOSSetup (void)
+\fn void EvrFreeRTOSSetup (uint32_t reset)
 \details
 The function \b EvrFreeRTOSSetup initializes Event Recorder and configures recording level filter. It must be called before any event is sent to the Event Recorder.
 
+The argument \a reset specifies if reset of previously applied configuration is performed in case if EvrFreeRTOSSetup was already called.
+
 Behavior of this function execution is defined with Event Recorder Configuration (\ref cmsis_freertos_evr_config). Calling this function has
 no effect when Event Recorder component is not selected.