Add missing defines for CMSIS-View EventRecorder

ARM-software · Sep 22, 2023 · 28a2da1 · 28a2da1
1 parent 58be777
commit 28a2da1
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/CMSIS/RTOS2/FreeRTOS/Include/freertos_evr.h b/CMSIS/RTOS2/FreeRTOS/Include/freertos_evr.h
@@ -1,5 +1,5 @@
 /* --------------------------------------------------------------------------
- * Copyright (c) 2013-2019 Arm Limited. All rights reserved.
+ * Copyright (c) 2013-2023 Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: Apache-2.0
  *

diff --git a/CMSIS/RTOS2/FreeRTOS/Include/freertos_os2.h b/CMSIS/RTOS2/FreeRTOS/Include/freertos_os2.h
@@ -1,5 +1,5 @@
 /* --------------------------------------------------------------------------
- * Copyright (c) 2013-2021 Arm Limited. All rights reserved.
+ * Copyright (c) 2013-2023 Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -33,7 +33,7 @@
 #include CMSIS_device_header
 
 /* Configuration and component setup check */
-#if defined(RTE_Compiler_EventRecorder)
+#if defined(RTE_Compiler_EventRecorder) || defined(RTE_CMSIS_View_EventRecorder)
   #if !defined(EVR_FREERTOS_DISABLE)
     #define USE_TRACE_EVENT_RECORDER
     /*

diff --git a/CMSIS/RTOS2/FreeRTOS/Source/ARM/clib_arm.c b/CMSIS/RTOS2/FreeRTOS/Source/ARM/clib_arm.c
@@ -1,5 +1,5 @@
 /* -------------------------------------------------------------------------- 
- * Copyright (c) 2013-2022 Arm Limited. All rights reserved.
+ * Copyright (c) 2013-2023 Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -47,7 +47,7 @@ __WEAK
 void _platform_post_stackheap_init (void);
 void _platform_post_stackheap_init (void) {
   /* Initialize OS, memory, etc. */
-  #if defined(RTE_Compiler_EventRecorder)
+  #if defined(RTE_Compiler_EventRecorder) || defined(RTE_CMSIS_View_EventRecorder)
     EvrFreeRTOSSetup(0);
   #endif
 }
@@ -58,7 +58,7 @@ __WEAK
 void software_init_hook (void);
 void software_init_hook (void) {
   /* Initialize OS, memory, etc. */
-  #if defined(RTE_Compiler_EventRecorder)
+  #if defined(RTE_Compiler_EventRecorder) || defined(RTE_CMSIS_View_EventRecorder)
     EvrFreeRTOSSetup(0);
   #endif
 }

diff --git a/CMSIS/RTOS2/FreeRTOS/Source/freertos_evr.c b/CMSIS/RTOS2/FreeRTOS/Source/freertos_evr.c
@@ -1,5 +1,5 @@
 /* --------------------------------------------------------------------------
- * Copyright (c) 2013-2019 Arm Limited. All rights reserved.
+ * Copyright (c) 2013-2023 Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -227,7 +227,7 @@ void EvrFreeRTOSSetup (uint32_t reset) {
 #endif
 }
 
-#endif /* RTE_Compiler_EventRecorder */
+#endif /* defined(RTE_Compiler_EventRecorder) || defined(RTE_CMSIS_View_EventRecorder) */
 
 /* Tasks */