RTX5: Moved SVC/PendSV handler priority setup from osKernelInitialize…

… to osKernelStart User Priority Grouping can be updated after osKernelInitialize but before osKernelStart.
ARM-software · Oct 30, 2017 · 6d4b699 · 6d4b699
1 parent 30e0577
commit 6d4b699
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/CMSIS/DoxyGen/RTOS2/src/cmsis_os2.txt b/CMSIS/DoxyGen/RTOS2/src/cmsis_os2.txt
@@ -156,6 +156,7 @@ File/Folder                  | Content
     <tr>
       <td>V5.2.3</td>
       <td>
+       - Moved SVC/PendSV handler priority setup from osKernelInitialize to osKernelStart (User Priority Grouping can be updated after osKernelInitialize but before osKernelStart).
        - Corrected SysTick and PendSV handlers for ARMv8-M Baseline.
        - Corrected memory allocation for stack and data when "Object specific Memory allocation" configuration is used.
       </td>

diff --git a/CMSIS/RTOS2/RTX/Source/rtx_core_ca.h b/CMSIS/RTOS2/RTX/Source/rtx_core_ca.h
@@ -338,8 +338,8 @@ __STATIC_INLINE t __svc##f (t1 a1, t2 a2, t3 a3, t4 a4) {                      \
 
 extern uint8_t IRQ_PendSV;
 
-/// Initialize SVC and PendSV System Service Calls (not needed on Cortex-A)
-__STATIC_INLINE void SVC_Initialize (void) {
+/// Setup SVC and PendSV System Service Calls (not needed on Cortex-A)
+__STATIC_INLINE void SVC_Setup (void) {
 }
 
 /// Get Pending SV (Service Call) Flag

diff --git a/CMSIS/RTOS2/RTX/Source/rtx_core_cm.h b/CMSIS/RTOS2/RTX/Source/rtx_core_cm.h
@@ -349,8 +349,8 @@ __STATIC_INLINE t __svc##f (t1 a1, t2 a2, t3 a3, t4 a4) {                      \
 
 //  ==== Core Peripherals functions ====
 
-/// Initialize SVC and PendSV System Service Calls
-__STATIC_INLINE void SVC_Initialize (void) {
+/// Setup SVC and PendSV System Service Calls
+__STATIC_INLINE void SVC_Setup (void) {
 #if   ((__ARM_ARCH_8M_MAIN__ == 1U) || (defined(__CORTEX_M) && (__CORTEX_M == 7U)))
   uint32_t p, n;
 

diff --git a/CMSIS/RTOS2/RTX/Source/rtx_kernel.c b/CMSIS/RTOS2/RTX/Source/rtx_kernel.c
@@ -195,9 +195,6 @@ osStatus_t svcRtxKernelInitialize (void) {
   }
 #endif
 
-  // Initialize SVC and PendSV System Service Calls
-  SVC_Initialize();
-
   osRtxInfo.kernel.state = osRtxKernelReady;
 
   EvrRtxKernelInitializeCompleted();
@@ -263,6 +260,9 @@ osStatus_t svcRtxKernelStart (void) {
     }
   }
 
+  // Setup SVC and PendSV System Service Calls
+  SVC_Setup();
+
   // Setup RTOS Tick
   if (OS_Tick_Setup(osRtxConfig.tick_freq, OS_TICK_HANDLER) != 0U) {
     return osError;