Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 6ec4100

Browse filesBrowse files
committed
Update CMSIS_RTOS_V2 management
Remove include of deleted file. SysTick_Handler already handled by the core. Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
1 parent 3ad1fc3 commit 6ec4100
Copy full SHA for 6ec4100

File tree

Expand file treeCollapse file tree

2 files changed

+5
-3
lines changed
Filter options
Expand file treeCollapse file tree

2 files changed

+5
-3
lines changed

‎portable/CMSIS_RTOS_V2/cmsis_os2.c

Copy file name to clipboardExpand all lines: portable/CMSIS_RTOS_V2/cmsis_os2.c
+5-2Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,8 @@ extern void SysTick_Handler (void);
148148
/* FreeRTOS tick timer interrupt handler prototype */
149149
extern void xPortSysTickHandler (void);
150150

151+
/* SysTick handler implementation done in the core and call osSystickHandler */
152+
#ifndef ARDUINO_ARCH_STM32
151153
/*
152154
SysTick handler implementation that also clears overflow flag.
153155
*/
@@ -160,6 +162,7 @@ void SysTick_Handler (void) {
160162
xPortSysTickHandler();
161163
}
162164
}
165+
#endif /* ARDUINO_ARCH_STM32 */
163166
#endif /* SysTick */
164167

165168
/*
@@ -171,7 +174,7 @@ __STATIC_INLINE void SVC_Setup (void) {
171174
/* and when its priority is lower or equal to BASEPRI, svc intruction */
172175
/* causes a Hard Fault. */
173176

174-
/*
177+
/*
175178
* the call below has introduced a regression compared to revious release
176179
* The issue was logged under:https://github.com/ARM-software/CMSIS-FreeRTOS/issues/35
177180
* until it is correctly fixed, the code below is commented
@@ -1469,7 +1472,7 @@ osSemaphoreId_t osSemaphoreNew (uint32_t max_count, uint32_t initial_count, cons
14691472
hSemaphore = xSemaphoreCreateCounting (max_count, initial_count);
14701473
}
14711474
}
1472-
1475+
14731476
#if (configQUEUE_REGISTRY_SIZE > 0)
14741477
if (hSemaphore != NULL) {
14751478
if (attr != NULL) {

‎src/cmsis_os.c

Copy file name to clipboardExpand all lines: src/cmsis_os.c
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
#if !defined(configUSE_CMSIS_RTOS_V2) || (configUSE_CMSIS_RTOS_V2 == 0)
99
#include "../portable/CMSIS_RTOS/cmsis_os.c"
1010
#else
11-
#include "../portable/CMSIS_RTOS_V2/cmsis_os1.c"
1211
#include "../portable/CMSIS_RTOS_V2/cmsis_os2.c"
1312
#endif
1413

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.