Merge pull request #2053 from AlessandroA/guard_svc_priority_set

sg- · web-flow · commit dff2c313ea36 · 2016-06-29T14:26:16.000-05:00
RTOS: Only set the SVC priority if uVisor is not present
diff --git a/rtos/rtx/TARGET_CORTEX_M/rt_HAL_CM.h b/rtos/rtx/TARGET_CORTEX_M/rt_HAL_CM.h
@@ -255,7 +255,11 @@ __inline static void rt_svc_init (void) {
   if (prigroup >= sh) {
     sh = prigroup + 1U;
   }
+
+/* Only change the SVCall priority if uVisor is not present. */
+#if !(defined(FEATURE_UVISOR) && defined(TARGET_UVISOR_SUPPORTED))
   NVIC_SYS_PRI2 = ((0xFEFFFFFFU << sh) & 0xFF000000U) | (NVIC_SYS_PRI2 & 0x00FFFFFFU);
+#endif /* !(defined(FEATURE_UVISOR) && defined(TARGET_UVISOR_SUPPORTED)) */
 #endif
 }
 

Original file line number	Diff line number	Diff line change
`@@ -255,7 +255,11 @@ __inline static void rt_svc_init (void) {`
`255`	`255`	`if (prigroup >= sh) {`
`256`	`256`	`sh = prigroup + 1U;`
`257`	`257`	`}`
	`258`	`+`
	`259`	`+/* Only change the SVCall priority if uVisor is not present. */`
	`260`	`+#if !(defined(FEATURE_UVISOR) && defined(TARGET_UVISOR_SUPPORTED))`
`258`	`261`	`NVIC_SYS_PRI2 = ((0xFEFFFFFFU << sh) & 0xFF000000U) \| (NVIC_SYS_PRI2 & 0x00FFFFFFU);`
	`262`	`+#endif /* !(defined(FEATURE_UVISOR) && defined(TARGET_UVISOR_SUPPORTED)) */`
`259`	`263`	`#endif`
`260`	`264`	`}`
`261`	`265`