change spr_read and write from __builtin to hal for irq

This commit is contained in:
Michael Rogenmoser 2020-12-07 09:40:15 +01:00
parent 8db90e9429
commit 034558d689

View file

@ -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