diff options
| -rw-r--r-- | arch/arm/core/fault.c | 2 | ||||
| -rw-r--r-- | include/arch/arm/cortex_m/scb.h | 15 |
2 files changed, 1 insertions, 16 deletions
diff --git a/arch/arm/core/fault.c b/arch/arm/core/fault.c index 60ca5a0c6..38fbdd3cc 100644 --- a/arch/arm/core/fault.c +++ b/arch/arm/core/fault.c @@ -360,7 +360,7 @@ static void _FaultDump(const NANO_ESF *esf, int fault) */ void _Fault(const NANO_ESF *esf) { - int fault = _ScbActiveVectorGet(); + int fault = SCB->ICSR & SCB_ICSR_VECTACTIVE_Msk; FAULT_DUMP(esf, fault); diff --git a/include/arch/arm/cortex_m/scb.h b/include/arch/arm/cortex_m/scb.h index 5c3795301..fbeef93e6 100644 --- a/include/arch/arm/cortex_m/scb.h +++ b/include/arch/arm/cortex_m/scb.h @@ -44,21 +44,6 @@ extern "C" { #include <misc/util.h> #include <stdint.h> -/** - * - * @brief Obtain the currently executing vector - * - * If currently handling an exception/interrupt, return the executing vector - * number. If not, return 0. - * - * @return the currently executing vector number, 0 if in thread mode. - */ - -static inline uint32_t _ScbActiveVectorGet(void) -{ - return __scs.scb.icsr.bit.vectactive; -} - #if defined(CONFIG_ARMV6_M) #elif defined(CONFIG_ARMV7_M) /** |