Remove the vIRQ_SetVectorX API

AlessandroA · AlessandroA · commit 1ce90d23db92 · 2016-03-16T13:58:07.000Z
The API was unused. vIRQ_SetVector is the official way of setting a
vIRQ.
diff --git a/api/inc/interrupts.h b/api/inc/interrupts.h
@@ -20,7 +20,6 @@
 #include "api/inc/uvisor_exports.h"
 #include <stdint.h>
 
-UVISOR_EXTERN void vIRQ_SetVectorX(uint32_t irqn, uint32_t vector, uint32_t flag);
 UVISOR_EXTERN void vIRQ_SetVector(uint32_t irqn, uint32_t vector);
 UVISOR_EXTERN uint32_t vIRQ_GetVector(uint32_t irqn);
 UVISOR_EXTERN void vIRQ_EnableIRQ(uint32_t irqn);
diff --git a/api/src/interrupts.c b/api/src/interrupts.c
@@ -22,21 +22,16 @@
  * This is declared in disabled.c and is only used if __uvisor_mode == 0. */
 UVISOR_EXTERN uint8_t g_nvic_prio_bits;
 
-void vIRQ_SetVectorX(uint32_t irqn, uint32_t vector, uint32_t flag)
+void vIRQ_SetVector(uint32_t irqn, uint32_t vector)
 {
     if(__uvisor_mode == 0) {
         uvisor_disabled_set_vector(irqn, vector);
     }
     else {
-        UVISOR_SVC(UVISOR_SVC_ID_ISR_SET, "", irqn, vector, flag);
+        UVISOR_SVC(UVISOR_SVC_ID_ISR_SET, "", irqn, vector);
     }
 }
 
-void vIRQ_SetVector(uint32_t irqn, uint32_t vector)
-{
-    vIRQ_SetVectorX(irqn, vector, 0);
-}
-
 uint32_t vIRQ_GetVector(uint32_t irqn)
 {
     if(__uvisor_mode == 0) {
diff --git a/core/system/inc/unvic.h b/core/system/inc/unvic.h
@@ -38,7 +38,7 @@ extern const TIsrVector g_isr_vector[ISR_VECTORS];
 /* unprivileged interrupts */
 extern TIsrUVector g_unvic_vector[NVIC_VECTORS];
 
-extern void     unvic_isr_set(uint32_t irqn, uint32_t vector, uint32_t flag);
+extern void     unvic_isr_set(uint32_t irqn, uint32_t vector);
 extern uint32_t unvic_isr_get(uint32_t irqn);
 
 extern void     unvic_irq_enable(uint32_t irqn);
diff --git a/core/system/src/unvic.c b/core/system/src/unvic.c
@@ -98,8 +98,7 @@ static int unvic_acl_check(int irqn)
     return is_irqn_registered;
 }
 
-/* FIXME flag is currently not implemented */
-void unvic_isr_set(uint32_t irqn, uint32_t vector, uint32_t flag)
+void unvic_isr_set(uint32_t irqn, uint32_t vector)
 {
     /* verify IRQ access privileges */
     unvic_acl_check(irqn);

Original file line number	Diff line number	Diff line change
`@@ -22,21 +22,16 @@`
`22`	`22`	`* This is declared in disabled.c and is only used if __uvisor_mode == 0. */`
`23`	`23`	`UVISOR_EXTERN uint8_t g_nvic_prio_bits;`
`24`	`24`
`25`		`-void vIRQ_SetVectorX(uint32_t irqn, uint32_t vector, uint32_t flag)`
	`25`	`+void vIRQ_SetVector(uint32_t irqn, uint32_t vector)`
`26`	`26`	`{`
`27`	`27`	`if(__uvisor_mode == 0) {`
`28`	`28`	`uvisor_disabled_set_vector(irqn, vector);`
`29`	`29`	`}`
`30`	`30`	`else {`
`31`		`- UVISOR_SVC(UVISOR_SVC_ID_ISR_SET, "", irqn, vector, flag);`
	`31`	`+ UVISOR_SVC(UVISOR_SVC_ID_ISR_SET, "", irqn, vector);`
`32`	`32`	`}`
`33`	`33`	`}`
`34`	`34`
`35`		`-void vIRQ_SetVector(uint32_t irqn, uint32_t vector)`
`36`		`-{`
`37`		`- vIRQ_SetVectorX(irqn, vector, 0);`
`38`		`-}`
`39`		`-`
`40`	`35`	`uint32_t vIRQ_GetVector(uint32_t irqn)`
`41`	`36`	`{`
`42`	`37`	`if(__uvisor_mode == 0) {`
Original file line number	Diff line number	Diff line change
`@@ -98,8 +98,7 @@ static int unvic_acl_check(int irqn)`
`98`	`98`	`return is_irqn_registered;`
`99`	`99`	`}`
`100`	`100`
`101`		`-/* FIXME flag is currently not implemented */`
`102`		`-void unvic_isr_set(uint32_t irqn, uint32_t vector, uint32_t flag)`
	`101`	`+void unvic_isr_set(uint32_t irqn, uint32_t vector)`
`103`	`102`	`{`
`104`	`103`	`/* verify IRQ access privileges */`
`105`	`104`	`unvic_acl_check(irqn);`