[BEETLE] Add CMSIS 5 virtual NVIC compliancy

fvincenzo · fvincenzo · commit b4d1cfe17fa9 · 2016-09-12T10:54:29.000+01:00
This patch adds CMSIS 5 virtual NVIC compliancy in order to support
uvisor.

Signed-off-by: Vincenzo Frascino &lt;vincenzo.frascino@arm.com&gt;
diff --git a/hal/targets/cmsis/TARGET_ARM_SSG/TARGET_BEETLE/cmsis_nvic.c b/hal/targets/cmsis/TARGET_ARM_SSG/TARGET_BEETLE/cmsis_nvic.c
@@ -21,7 +21,7 @@
 #define NVIC_RAM_VECTOR_ADDRESS (0x20000000) //Location of vectors in RAM
 #define NVIC_FLASH_VECTOR_ADDRESS (0x00000000) //Initial vector position in flash
 
-void NVIC_SetVector(IRQn_Type IRQn, uint32_t vector) {
+void __NVIC_SetVector(IRQn_Type IRQn, uint32_t vector) {
     uint32_t *vectors = (uint32_t*)SCB->VTOR;
     uint32_t i;
 
@@ -37,7 +37,7 @@ void NVIC_SetVector(IRQn_Type IRQn, uint32_t vector) {
     vectors[IRQn + NVIC_USER_IRQ_OFFSET] = 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 + NVIC_USER_IRQ_OFFSET];
 }
diff --git a/hal/targets/cmsis/TARGET_ARM_SSG/TARGET_BEETLE/cmsis_nvic.h b/hal/targets/cmsis/TARGET_ARM_SSG/TARGET_BEETLE/cmsis_nvic.h
@@ -29,8 +29,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
`@@ -21,7 +21,7 @@`
`21`	`21`	`#define NVIC_RAM_VECTOR_ADDRESS (0x20000000) //Location of vectors in RAM`
`22`	`22`	`#define NVIC_FLASH_VECTOR_ADDRESS (0x00000000) //Initial vector position in flash`
`23`	`23`
`24`		`-void NVIC_SetVector(IRQn_Type IRQn, uint32_t vector) {`
	`24`	`+void __NVIC_SetVector(IRQn_Type IRQn, uint32_t vector) {`
`25`	`25`	`uint32_t vectors = (uint32_t)SCB->VTOR;`
`26`	`26`	`uint32_t i;`
`27`	`27`
`@@ -37,7 +37,7 @@ void NVIC_SetVector(IRQn_Type IRQn, uint32_t vector) {`
`37`	`37`	`vectors[IRQn + NVIC_USER_IRQ_OFFSET] = vector;`
`38`	`38`	`}`
`39`	`39`
`40`		`-uint32_t NVIC_GetVector(IRQn_Type IRQn) {`
	`40`	`+uint32_t __NVIC_GetVector(IRQn_Type IRQn) {`
`41`	`41`	`uint32_t vectors = (uint32_t)SCB->VTOR;`
`42`	`42`	`return vectors[IRQn + NVIC_USER_IRQ_OFFSET];`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,8 @@`
`29`	`29`	`extern "C" {`
`30`	`30`	`#endif`
`31`	`31`
`32`		`-void NVIC_SetVector(IRQn_Type IRQn, uint32_t vector);`
`33`		`-uint32_t NVIC_GetVector(IRQn_Type IRQn);`
	`32`	`+void __NVIC_SetVector(IRQn_Type IRQn, uint32_t vector);`
	`33`	`+uint32_t __NVIC_GetVector(IRQn_Type IRQn);`
`34`	`34`
`35`	`35`	`#ifdef __cplusplus`
`36`	`36`	`}`