From 984002de6de0e85e72183a3ff085863eea5dc6a9 Mon Sep 17 00:00:00 2001 From: Daniel Leung Date: Tue, 27 Aug 2019 11:07:19 -0700 Subject: [PATCH] xtensa: rename z_arch_irq_is_enabled for multi-level interrupts This follows the z_arch_irq_en-/dis-able() so that the SoC definitions are responsible for functions related to multi-level interrupts. Signed-off-by: Daniel Leung --- arch/xtensa/core/xtensa-asm2.c | 2 +- include/arch/xtensa/irq.h | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/arch/xtensa/core/xtensa-asm2.c b/arch/xtensa/core/xtensa-asm2.c index 02008bf3588..0036d7a4178 100644 --- a/arch/xtensa/core/xtensa-asm2.c +++ b/arch/xtensa/core/xtensa-asm2.c @@ -222,7 +222,7 @@ void *xtensa_excint1_c(int *interrupted_stack) return z_get_next_switch_handle(interrupted_stack); } -int z_arch_irq_is_enabled(unsigned int irq) +int z_xtensa_irq_is_enabled(unsigned int irq) { u32_t ie; diff --git a/include/arch/xtensa/irq.h b/include/arch/xtensa/irq.h index fe8e9974915..9d770c9f556 100644 --- a/include/arch/xtensa/irq.h +++ b/include/arch/xtensa/irq.h @@ -34,6 +34,8 @@ #define z_arch_irq_enable(irq) z_soc_irq_enable(irq) #define z_arch_irq_disable(irq) z_soc_irq_disable(irq) +#define z_arch_irq_is_enabled(irq) z_soc_irq_is_enabled(irq) + #else #define CONFIG_NUM_IRQS XCHAL_NUM_INTERRUPTS @@ -41,6 +43,8 @@ #define z_arch_irq_enable(irq) z_xtensa_irq_enable(irq) #define z_arch_irq_disable(irq) z_xtensa_irq_disable(irq) +#define z_arch_irq_is_enabled(irq) z_xtensa_irq_is_enabled(irq) + #endif /** @@ -92,7 +96,7 @@ static ALWAYS_INLINE bool z_arch_irq_unlocked(unsigned int key) return (key & 0xf) == 0; /* INTLEVEL field */ } -extern int z_arch_irq_is_enabled(unsigned int irq); +extern int z_xtensa_irq_is_enabled(unsigned int irq); #include