Rename NVIC_Set/GetVector for K64F

salkinium · salkinium · commit 69b45b7585ef · 2016-06-13T18:57:31.000+01:00
This allows FEATURE_UVISOR to virtualize the NVIC calls.
diff --git a/hal/targets/cmsis/TARGET_Freescale/TARGET_K64F/cmsis_nvic.c b/hal/targets/cmsis/TARGET_Freescale/TARGET_K64F/cmsis_nvic.c
@@ -32,11 +32,11 @@
 
 extern void InstallIRQHandler(IRQn_Type irq, uint32_t irqHandler);
 
-void NVIC_SetVector(IRQn_Type IRQn, uint32_t vector) {
+void __NVIC_SetVector(IRQn_Type IRQn, uint32_t vector) {
     InstallIRQHandler(IRQn, vector);
 }
 
-uint32_t NVIC_GetVector(IRQn_Type IRQn) {
+uint32_t __NVIC_GetVector(IRQn_Type IRQn) {
     uint32_t *vectors = (uint32_t*)SCB->VTOR;
     return vectors[IRQn + 16];
 }
diff --git a/hal/targets/cmsis/TARGET_Freescale/TARGET_K64F/cmsis_nvic.h b/hal/targets/cmsis/TARGET_Freescale/TARGET_K64F/cmsis_nvic.h
@@ -41,8 +41,8 @@
 extern "C" {
 #endif
 
-void NVIC_SetVector(IRQn_Type IRQn, uint32_t vector);
-uint32_t NVIC_GetVector(IRQn_Type IRQn);
+void __NVIC_SetVector(IRQn_Type IRQn, uint32_t vector);
+uint32_t __NVIC_GetVector(IRQn_Type IRQn);
 
 #ifdef __cplusplus
 }

Original file line number	Diff line number	Diff line change
`@@ -32,11 +32,11 @@`
`32`	`32`
`33`	`33`	`extern void InstallIRQHandler(IRQn_Type irq, uint32_t irqHandler);`
`34`	`34`
`35`		`-void NVIC_SetVector(IRQn_Type IRQn, uint32_t vector) {`
	`35`	`+void __NVIC_SetVector(IRQn_Type IRQn, uint32_t vector) {`
`36`	`36`	`InstallIRQHandler(IRQn, vector);`
`37`	`37`	`}`
`38`	`38`
`39`		`-uint32_t NVIC_GetVector(IRQn_Type IRQn) {`
	`39`	`+uint32_t __NVIC_GetVector(IRQn_Type IRQn) {`
`40`	`40`	`uint32_t vectors = (uint32_t)SCB->VTOR;`
`41`	`41`	`return vectors[IRQn + 16];`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,8 +41,8 @@`
`41`	`41`	`extern "C" {`
`42`	`42`	`#endif`
`43`	`43`
`44`		`-void NVIC_SetVector(IRQn_Type IRQn, uint32_t vector);`
`45`		`-uint32_t NVIC_GetVector(IRQn_Type IRQn);`
	`44`	`+void __NVIC_SetVector(IRQn_Type IRQn, uint32_t vector);`
	`45`	`+uint32_t __NVIC_GetVector(IRQn_Type IRQn);`
`46`	`46`
`47`	`47`	`#ifdef __cplusplus`
`48`	`48`	`}`