arm: nvic: kill _NvicSwInterruptTrigger

_NvicSwInterruptTrigger is only utilized by a testcase for irq handling on ARM-V7M. Just put the code into the testcase so we dont need to support an additional interface. Change-Id: I763c63c32a7a52918250458351d08b8fa54069dd Signed-off-by: Kumar Gala <[email protected]>
FantomJAC · Jan 23, 2017 · 2e0c2af · 2e0c2af
1 parent 6e14642
commit 2e0c2af
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 28 deletions.
diff --git a/include/arch/arm/cortex_m/nvic.h b/include/arch/arm/cortex_m/nvic.h
@@ -224,32 +224,6 @@ static inline uint8_t _NvicIrqPrioGet(unsigned int irq)
 #endif /* CONFIG_ARMV6_M */
 }
 
-#if defined(CONFIG_ARMV6_M)
-#elif defined(CONFIG_ARMV7_M)
-/**
- *
- * @brief Trigger an interrupt via software
- *
- * Trigger interrupt #@a irq. The CPU will handle the IRQ when interrupts are
- * enabled and/or returning from a higher priority interrupt.
- *
- * @param irq IRQ number
- * @return N/A
- */
-
-static inline void _NvicSwInterruptTrigger(unsigned int irq)
-{
-#if defined(CONFIG_SOC_TI_LM3S6965_QEMU)
-	/* the QEMU does not simulate the STIR register: this is a workaround */
-	_NvicIrqPend(irq);
-#else
-	__scs.stir = irq;
-#endif
-}
-#else
-#error Unknown ARM architecture
-#endif /* CONFIG_ARMV6_M */
-
 #endif /* !_ASMLANGUAGE */
 
 #ifdef __cplusplus

diff --git a/tests/kernel/arm_irq_vector_table/src/main.c b/tests/kernel/arm_irq_vector_table/src/main.c
@@ -81,7 +81,12 @@ void test_irq_vector_table(void)
 				k_sem_take(&sem[2], K_NO_WAIT)), NULL);
 
 	for (int ii = 0; ii < 3; ii++) {
-		_NvicSwInterruptTrigger(ii);
+#if defined(CONFIG_SOC_TI_LM3S6965_QEMU)
+		/* the QEMU does not simulate the STIR register: this is a workaround */
+		_NvicIrqPend(ii);
+#else
+		__scs.stir = ii;
+#endif
 	}
 
 	assert_false((k_sem_take(&sem[0], K_NO_WAIT) ||

diff --git a/tests/legacy/kernel/test_arm_irq_vector_table/src/main.c b/tests/legacy/kernel/test_arm_irq_vector_table/src/main.c
@@ -94,7 +94,12 @@ void main(void)
 	}
 
 	for (int ii = 0; ii < 3; ii++) {
-		_NvicSwInterruptTrigger(ii);
+#if defined(CONFIG_SOC_TI_LM3S6965_QEMU)
+		/* the QEMU does not simulate the STIR register: this is a workaround */
+		_NvicIrqPend(ii);
+#else
+		__scs.stir = ii;
+#endif
 	}
 
 	rv = nano_task_sem_take(&sem[0], TICKS_NONE) &&