From 034558d6899033478b5023f27c21bee4d4bf9b6a Mon Sep 17 00:00:00 2001 From: Michael Rogenmoser Date: Mon, 7 Dec 2020 09:40:15 +0100 Subject: [PATCH] change spr_read and write from __builtin to hal for irq --- include/implem/irq.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/implem/irq.h b/include/implem/irq.h index f1be8c3..d0c892c 100644 --- a/include/implem/irq.h +++ b/include/implem/irq.h @@ -108,9 +108,9 @@ static inline unsigned int rt_irq_get_fc_vector_base() #if defined(__RISCV_GENERIC__) return hal_spr_read(0x305) & ~1; #elif defined(ARCHI_CORE_HAS_SECURITY) && !defined(ARCHI_CORE_HAS_1_10) - return __builtin_pulp_spr_read(SR_MTVEC); + return hal_spr_read(SR_MTVEC); #elif defined(ARCHI_CORE_HAS_1_10) - return __builtin_pulp_spr_read(SR_MTVEC) & ~1; + return hal_spr_read(SR_MTVEC) & ~1; #elif defined(APB_SOC_VERSION) && APB_SOC_VERSION >= 2 return apb_soc_bootaddr_get(); #endif @@ -121,7 +121,7 @@ static inline unsigned int rt_irq_get_fc_vector_base() #if defined(__RISCV_GENERIC__) return hal_spr_read(0x305) & ~1; #elif defined(ARCHI_CORE_HAS_1_10) - return __builtin_pulp_spr_read(SR_MTVEC) & ~1; + return hal_spr_read(SR_MTVEC) & ~1; #elif defined(ARCHI_CLUSTER_CTRL_ADDR) return plp_ctrl_bootaddr_get(); #endif @@ -140,9 +140,9 @@ static inline void rt_irq_set_fc_vector_base(unsigned int base) #if defined(__RISCV_GENERIC__) hal_spr_write(0x305, base); #elif defined(ARCHI_CORE_HAS_SECURITY) - __builtin_pulp_spr_write(SR_MTVEC, base); + hal_spr_write(SR_MTVEC, base); #elif defined(ARCHI_CORE_HAS_1_10) - __builtin_pulp_spr_write(SR_MTVEC, base | 1); + hal_spr_write(SR_MTVEC, base | 1); #elif defined(APB_SOC_VERSION) && APB_SOC_VERSION >= 2 apb_soc_bootaddr_set(base); #endif @@ -153,7 +153,7 @@ static inline void rt_irq_set_fc_vector_base(unsigned int base) #if defined(__RISCV_GENERIC__) hal_spr_write(0x305, base); #elif defined(ARCHI_CORE_HAS_1_10) - __builtin_pulp_spr_write(SR_MTVEC, base | 1); + hal_spr_write(SR_MTVEC, base | 1); #elif defined(ARCHI_CLUSTER_CTRL_ADDR) plp_ctrl_bootaddr_set(base); #endif