Skip to content

fix: include CMSIS device header unconditionally in freertos_os2.h #184

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
VladimirUmek merged 2 commits into from
May 8, 2026
+20 −13
Merged

fix: include CMSIS device header unconditionally in freertos_os2.h #184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f9e20be
fix: include CMSIS device header unconditionally in freertos_os2.h
KnoerleMaTLS Apr 20, 2026
03b37b9
Correct RTE_Components.h and CMSIS_device_header includes
VladimirUmek May 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion CMSIS/RTOS2/FreeRTOS/Include/freertos_evr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* --------------------------------------------------------------------------
* Copyright (c) 2013-2025 Arm Limited. All rights reserved.
* Copyright 2013-2026 Arm Limited and/or its affiliates.
*
* SPDX-License-Identifier: Apache-2.0
*
Expand All @@ -26,7 +26,9 @@
#include <stdint.h>
#include <stdlib.h>

#if defined(_RTE_)
#include "RTE_Components.h"
#endif

#if !defined(RTE_Compiler_EventRecorder) && !defined(RTE_CMSIS_View_EventRecorder)
/* Disable debug events if Event Recorder is not used */
Expand Down
5 changes: 4 additions & 1 deletion CMSIS/RTOS2/FreeRTOS/Include/freertos_os2.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@

#if defined(_RTE_)
#include "RTE_Components.h" // Component selection
#elif !defined(CMSIS_device_header)
#error "CMSIS_device_header must be defined to point to CMSIS device header"
#endif

#include CMSIS_device_header

/* Configuration and component setup check */
Expand All @@ -54,7 +58,6 @@
#if defined(RTE_RTOS_FreeRTOS_HEAP_5)
#define USE_FreeRTOS_HEAP_5
#endif
#endif /* _RTE_ */

/*
CMSIS-RTOS2 FreeRTOS image size optimization definitions.
Expand Down
8 changes: 7 additions & 1 deletion CMSIS/RTOS2/FreeRTOS/Source/clib_os.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* --------------------------------------------------------------------------
* Copyright (c) 2024-2025 Arm Limited. All rights reserved.
* Copyright 2024-2026 Arm Limited and/or its affiliates.
*
* SPDX-License-Identifier: Apache-2.0
*
Expand Down Expand Up @@ -27,6 +27,12 @@
#include "task.h" // ARM.FreeRTOS::RTOS:Core
#include "semphr.h" // ARM.FreeRTOS::RTOS:Core

#include "cmsis_compiler.h"

#if defined(_RTE_)
#include "RTE_Components.h"
#endif

/* Event Recorder initialization before entering function "main" */
#if (defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050) && !defined(__MICROLIB))
extern void _platform_post_stackheap_init (void);
Expand Down
16 changes: 6 additions & 10 deletions CMSIS/RTOS2/FreeRTOS/Source/handlers.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,5 @@
/******************************************************************************
* @file irq_handler.c
* @brief CMSIS-FreeRTOS Interrupt Handler
* @version 9.1.0
* @date 11 Aug 2017
*
* @note
*
******************************************************************************/
/*
* Copyright (c) 2017 Arm Limited. All rights reserved.
* Copyright 2017-2018, 2026 Arm Limited and/or its affiliates.
*
* SPDX-License-Identifier: Apache-2.0
*
Expand All @@ -27,7 +18,12 @@

#include <stddef.h>

#if defined(_RTE_)
#include "RTE_Components.h"
#elif !defined(CMSIS_device_header)
#error "CMSIS_device_header must be defined to point to CMSIS device header"
#endif

#include CMSIS_device_header
#include "irq_ctrl.h"

Expand Down
Loading