This is an automated email from the ASF dual-hosted git repository. pkarashchenko pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit d1a3f5e47f752142251c30b188c8d1b47ef59941 Author: Xiang Xiao <[email protected]> AuthorDate: Wed Oct 26 10:49:18 2022 +0800 arch/arm: Replace xxx_[bus|usage]fault with arm_[bus|usage]fault to fix the following clang warning: Error: chip/eoss3_irq.c:138:47: error: format specifies type 'unsigned int' but the argument has type 'uint32_t' (aka 'unsigned long') [-Werror,-Wformat] _err("PANIC!!! Bus fault received: %08x\n", getreg32(NVIC_CFAULTS)); ~~~~ ^~~~~~~~~~~~~~~~~~~~~~ %08lx /github/workspace/sources/nuttx/include/debug.h:126:57: note: expanded from macro '_err' __arch_syslog(LOG_ERR, EXTRA_FMT format EXTRA_ARG, ##__VA_ARGS__) ~~~~~~ ^~~~~~~~~~~ /github/workspace/sources/nuttx/arch/arm/src/common/arm_internal.h:134:24: note: expanded from macro 'getreg32' ^~~~~~~~~~~~~~~~~~~~~~~~~~~ Error: chip/eoss3_irq.c:146:49: error: format specifies type 'unsigned int' but the argument has type 'uint32_t' (aka 'unsigned long') [-Werror,-Wformat] _err("PANIC!!! Usage fault received: %08x\n", getreg32(NVIC_CFAULTS)); ~~~~ ^~~~~~~~~~~~~~~~~~~~~~ %08lx Signed-off-by: Xiang Xiao <[email protected]> --- arch/arm/src/armv7-m/arm_busfault.c | 6 ++++-- arch/arm/src/armv7-m/arm_hardfault.c | 6 ++++-- arch/arm/src/armv7-m/arm_memfault.c | 3 ++- arch/arm/src/armv7-m/arm_usagefault.c | 6 ++++-- arch/arm/src/armv8-m/arm_busfault.c | 6 ++++-- arch/arm/src/armv8-m/arm_hardfault.c | 6 ++++-- arch/arm/src/armv8-m/arm_memfault.c | 3 ++- arch/arm/src/armv8-m/arm_securefault.c | 3 ++- arch/arm/src/armv8-m/arm_usagefault.c | 6 ++++-- arch/arm/src/cxd56xx/cxd56_irq.c | 22 +++------------------- arch/arm/src/efm32/efm32_irq.c | 22 +++------------------- arch/arm/src/eoss3/eoss3_irq.c | 22 +++------------------- arch/arm/src/gd32f4/gd32f4xx_irq.c | 24 +++--------------------- arch/arm/src/imxrt/imxrt_irq.c | 24 +++--------------------- arch/arm/src/kinetis/kinetis_irq.c | 22 +++------------------- arch/arm/src/lc823450/lc823450_irq.c | 22 +++------------------- arch/arm/src/lpc17xx_40xx/lpc17_40_irq.c | 20 ++------------------ arch/arm/src/lpc43xx/lpc43_irq.c | 22 +++------------------- arch/arm/src/lpc54xx/lpc54_irq.c | 22 +++------------------- arch/arm/src/max326xx/common/max326_irq.c | 22 +++------------------- arch/arm/src/nrf52/nrf52_irq.c | 22 +++------------------- arch/arm/src/nrf53/nrf53_irq.c | 22 +++------------------- arch/arm/src/s32k1xx/s32k14x/s32k14x_irq.c | 22 +++------------------- arch/arm/src/s32k3xx/s32k3xx_irq.c | 22 +++------------------- arch/arm/src/sam34/sam_irq.c | 22 +++------------------- arch/arm/src/samd5e5/sam_irq.c | 22 +++------------------- arch/arm/src/samv7/sam_irq.c | 23 +++-------------------- arch/arm/src/stm32/stm32_irq.c | 24 +++--------------------- arch/arm/src/stm32f7/stm32_irq.c | 24 +++--------------------- arch/arm/src/stm32h7/stm32_irq.c | 22 +++------------------- arch/arm/src/stm32l4/stm32l4_irq.c | 22 +++------------------- arch/arm/src/stm32l5/stm32l5_irq.c | 22 +++------------------- arch/arm/src/stm32u5/stm32_irq.c | 22 +++------------------- arch/arm/src/stm32wb/stm32wb_irq.c | 24 +++--------------------- arch/arm/src/stm32wl5/stm32wl5_irq.c | 27 ++++----------------------- arch/arm/src/tiva/common/tiva_irq.c | 22 +++------------------- arch/arm/src/xmc4/xmc4_irq.c | 22 +++------------------- 37 files changed, 114 insertions(+), 561 deletions(-) diff --git a/arch/arm/src/armv7-m/arm_busfault.c b/arch/arm/src/armv7-m/arm_busfault.c index 81ab7a6152..41f0b8d4aa 100644 --- a/arch/arm/src/armv7-m/arm_busfault.c +++ b/arch/arm/src/armv7-m/arm_busfault.c @@ -63,9 +63,11 @@ int arm_busfault(int irq, void *context, void *arg) bfalert("PANIC!!! Bus Fault:\n"); bfalert("\tIRQ: %d regs: %p\n", irq, context); - bfalert("\tBASEPRI: %08x PRIMASK: %08x IPSR: %08x CONTROL: %08x\n", + bfalert("\tBASEPRI: %08x PRIMASK: %08x IPSR: %08" + PRIx32 " CONTROL: %08" PRIx32 "\n", getbasepri(), getprimask(), getipsr(), getcontrol()); - bfalert("\tCFSR: %08x HFSR: %08x DFSR: %08x BFAR: %08x AFSR: %08x\n", + bfalert("\tCFSR: %08" PRIx32 " HFSR: %08" PRIx32 " DFSR: %08" + PRIx32 " BFAR: %08" PRIx32 " AFSR: %08" PRIx32 "\n", cfsr, getreg32(NVIC_HFAULTS), getreg32(NVIC_DFAULTS), getreg32(NVIC_BFAULT_ADDR), getreg32(NVIC_AFAULTS)); diff --git a/arch/arm/src/armv7-m/arm_hardfault.c b/arch/arm/src/armv7-m/arm_hardfault.c index f0dfdf514a..7ea7ec4c12 100644 --- a/arch/arm/src/armv7-m/arm_hardfault.c +++ b/arch/arm/src/armv7-m/arm_hardfault.c @@ -152,9 +152,11 @@ int arm_hardfault(int irq, void *context, void *arg) hfalert("PANIC!!! Hard Fault!:"); hfalert("\tIRQ: %d regs: %p\n", irq, context); - hfalert("\tBASEPRI: %08x PRIMASK: %08x IPSR: %08x CONTROL: %08x\n", + hfalert("\tBASEPRI: %08x PRIMASK: %08x IPSR: %08" + PRIx32 " CONTROL: %08" PRIx32 "\n", getbasepri(), getprimask(), getipsr(), getcontrol()); - hfalert("\tCFSR: %08x HFSR: %08x DFSR: %08x BFAR: %08x AFSR: %08x\n", + hfalert("\tCFSR: %08" PRIx32 " HFSR: %08" PRIx32 " DFSR: %08" + PRIx32 " BFAR: %08" PRIx32 " AFSR: %08" PRIx32 "\n", cfsr, hfsr, getreg32(NVIC_DFAULTS), getreg32(NVIC_BFAULT_ADDR), getreg32(NVIC_AFAULTS)); diff --git a/arch/arm/src/armv7-m/arm_memfault.c b/arch/arm/src/armv7-m/arm_memfault.c index 1f36789808..8b9a164f1a 100644 --- a/arch/arm/src/armv7-m/arm_memfault.c +++ b/arch/arm/src/armv7-m/arm_memfault.c @@ -68,7 +68,8 @@ int arm_memfault(int irq, void *context, void *arg) mfalert("\tIRQ: %d context: %p\n", irq, context); mfalert("\tCFSR: %08x MMFAR: %08x\n", getreg32(NVIC_CFAULTS), getreg32(NVIC_MEMMANAGE_ADDR)); - mfalert("\tBASEPRI: %08x PRIMASK: %08x IPSR: %08x CONTROL: %08x\n", + mfalert("\tBASEPRI: %08x PRIMASK: %08x IPSR: %08" + PRIx32 " CONTROL: %08" PRIx32 "\n", getbasepri(), getprimask(), getipsr(), getcontrol()); mfalert("Memory Management Fault Reason:\n"); diff --git a/arch/arm/src/armv7-m/arm_usagefault.c b/arch/arm/src/armv7-m/arm_usagefault.c index 7fb0a55221..00579faa47 100644 --- a/arch/arm/src/armv7-m/arm_usagefault.c +++ b/arch/arm/src/armv7-m/arm_usagefault.c @@ -65,9 +65,11 @@ int arm_usagefault(int irq, void *context, void *arg) ufalert("PANIC!!! Usage Fault:\n"); ufalert("\tIRQ: %d regs: %p\n", irq, context); - ufalert("\tBASEPRI: %08x PRIMASK: %08x IPSR: %08x CONTROL: %08x\n", + ufalert("\tBASEPRI: %08x PRIMASK: %08x IPSR: %08" + PRIx32 " CONTROL: %08" PRIx32 "\n", getbasepri(), getprimask(), getipsr(), getcontrol()); - ufalert("\tCFSR: %08x HFSR: %08x DFSR: %08x BFAR: %08x AFSR: %08x\n", + ufalert("\tCFSR: %08" PRIx32 " HFSR: %08" PRIx32 " DFSR: %08" + PRIx32 " BFAR: %08" PRIx32 " AFSR: %08" PRIx32 "\n", cfsr, getreg32(NVIC_HFAULTS), getreg32(NVIC_DFAULTS), getreg32(NVIC_BFAULT_ADDR), getreg32(NVIC_AFAULTS)); diff --git a/arch/arm/src/armv8-m/arm_busfault.c b/arch/arm/src/armv8-m/arm_busfault.c index 11ccac444e..5feafdf43e 100644 --- a/arch/arm/src/armv8-m/arm_busfault.c +++ b/arch/arm/src/armv8-m/arm_busfault.c @@ -63,9 +63,11 @@ int arm_busfault(int irq, void *context, void *arg) bfalert("PANIC!!! Bus Fault:\n"); bfalert("\tIRQ: %d regs: %p\n", irq, context); - bfalert("\tBASEPRI: %08x PRIMASK: %08x IPSR: %08x CONTROL: %08x\n", + bfalert("\tBASEPRI: %08x PRIMASK: %08x IPSR: %08" + PRIx32 " CONTROL: %08" PRIx32 "\n", getbasepri(), getprimask(), getipsr(), getcontrol()); - bfalert("\tCFSR: %08x HFSR: %08x DFSR: %08x BFAR: %08x AFSR: %08x\n", + bfalert("\tCFSR: %08" PRIx32 " HFSR: %08" PRIx32 " DFSR: %08" + PRIx32 " BFAR: %08" PRIx32 " AFSR: %08" PRIx32 "\n", cfsr, getreg32(NVIC_HFAULTS), getreg32(NVIC_DFAULTS), getreg32(NVIC_BFAULT_ADDR), getreg32(NVIC_AFAULTS)); diff --git a/arch/arm/src/armv8-m/arm_hardfault.c b/arch/arm/src/armv8-m/arm_hardfault.c index 0e459b8ade..0eec176999 100644 --- a/arch/arm/src/armv8-m/arm_hardfault.c +++ b/arch/arm/src/armv8-m/arm_hardfault.c @@ -162,9 +162,11 @@ int arm_hardfault(int irq, void *context, void *arg) hfalert("PANIC!!! Hard Fault!:"); hfalert("\tIRQ: %d regs: %p\n", irq, context); - hfalert("\tBASEPRI: %08x PRIMASK: %08x IPSR: %08x CONTROL: %08x\n", + hfalert("\tBASEPRI: %08x PRIMASK: %08x IPSR: %08" + PRIx32 " CONTROL: %08" PRIx32 "\n", getbasepri(), getprimask(), getipsr(), getcontrol()); - hfalert("\tCFSR: %08x HFSR: %08x DFSR: %08x BFAR: %08x AFSR: %08x\n", + hfalert("\tCFSR: %08" PRIx32 " HFSR: %08" PRIx32 " DFSR: %08" + PRIx32 " BFAR: %08" PRIx32 " AFSR: %08" PRIx32 "\n", cfsr, hfsr, getreg32(NVIC_DFAULTS), getreg32(NVIC_BFAULT_ADDR), getreg32(NVIC_AFAULTS)); diff --git a/arch/arm/src/armv8-m/arm_memfault.c b/arch/arm/src/armv8-m/arm_memfault.c index 526a02af8f..b6b52b1b19 100644 --- a/arch/arm/src/armv8-m/arm_memfault.c +++ b/arch/arm/src/armv8-m/arm_memfault.c @@ -68,7 +68,8 @@ int arm_memfault(int irq, void *context, void *arg) mfalert("\tIRQ: %d context: %p\n", irq, context); mfalert("\tCFSR: %08x MMFAR: %08x\n", getreg32(NVIC_CFAULTS), getreg32(NVIC_MEMMANAGE_ADDR)); - mfalert("\tBASEPRI: %08x PRIMASK: %08x IPSR: %08x CONTROL: %08x\n", + mfalert("\tBASEPRI: %08x PRIMASK: %08x IPSR: %08" + PRIx32 " CONTROL: %08" PRIx32 "\n", getbasepri(), getprimask(), getipsr(), getcontrol()); mfalert("Memory Management Fault Reason:\n"); diff --git a/arch/arm/src/armv8-m/arm_securefault.c b/arch/arm/src/armv8-m/arm_securefault.c index 47327d901f..77775c83d0 100644 --- a/arch/arm/src/armv8-m/arm_securefault.c +++ b/arch/arm/src/armv8-m/arm_securefault.c @@ -109,7 +109,8 @@ int arm_securefault(int irq, void *context, void *arg) sfalert("PANIC!!! Secure Fault:\n"); sfalert("\tIRQ: %d regs: %p\n", irq, context); - sfalert("\tBASEPRI: %08x PRIMASK: %08x IPSR: %08x CONTROL: %08x\n", + sfalert("\tBASEPRI: %08x PRIMASK: %08x IPSR: %08" + PRIx32 " CONTROL: %08" PRIx32 "\n", getbasepri(), getprimask(), getipsr(), getcontrol()); sfalert("\tCFSR: %08x HFSR: %08x DFSR: %08x\n", getreg32(NVIC_CFAULTS), getreg32(NVIC_HFAULTS), getreg32(NVIC_DFAULTS)); diff --git a/arch/arm/src/armv8-m/arm_usagefault.c b/arch/arm/src/armv8-m/arm_usagefault.c index 7f1f774443..3706d38db2 100644 --- a/arch/arm/src/armv8-m/arm_usagefault.c +++ b/arch/arm/src/armv8-m/arm_usagefault.c @@ -65,9 +65,11 @@ int arm_usagefault(int irq, void *context, void *arg) ufalert("PANIC!!! Usage Fault:\n"); ufalert("\tIRQ: %d regs: %p\n", irq, context); - ufalert("\tBASEPRI: %08x PRIMASK: %08x IPSR: %08x CONTROL: %08x\n", + ufalert("\tBASEPRI: %08x PRIMASK: %08x IPSR: %08" + PRIx32 " CONTROL: %08" PRIx32 "\n", getbasepri(), getprimask(), getipsr(), getcontrol()); - ufalert("\tCFSR: %08x HFSR: %08x DFSR: %08x BFAR: %08x AFSR: %08x\n", + ufalert("\tCFSR: %08" PRIx32 " HFSR: %08" PRIx32 " DFSR: %08" + PRIx32 " BFAR: %08" PRIx32 " AFSR: %08" PRIx32 "\n", cfsr, getreg32(NVIC_HFAULTS), getreg32(NVIC_DFAULTS), getreg32(NVIC_BFAULT_ADDR), getreg32(NVIC_AFAULTS)); diff --git a/arch/arm/src/cxd56xx/cxd56_irq.c b/arch/arm/src/cxd56xx/cxd56_irq.c index 80fb917b17..98770ed6e7 100644 --- a/arch/arm/src/cxd56xx/cxd56_irq.c +++ b/arch/arm/src/cxd56xx/cxd56_irq.c @@ -151,7 +151,7 @@ static void cxd56_dumpnvic(const char *msg, int irq) #endif /**************************************************************************** - * Name: cxd56_nmi, cxd56_busfault, cxd56_usagefault, cxd56_pendsv, + * Name: cxd56_nmi, cxd56_pendsv, * cxd56_dbgmonitor, cxd56_pendsv, cxd56_reserved * * Description: @@ -170,22 +170,6 @@ static int cxd56_nmi(int irq, void *context, void *arg) return 0; } -static int cxd56_busfault(int irq, void *context, void *arg) -{ - up_irq_save(); - _err("PANIC!!! Bus fault received\n"); - PANIC(); - return 0; -} - -static int cxd56_usagefault(int irq, void *context, void *arg) -{ - up_irq_save(); - _err("PANIC!!! Usage fault received\n"); - PANIC(); - return 0; -} - static int cxd56_pendsv(int irq, void *context, void *arg) { up_irq_save(); @@ -376,8 +360,8 @@ void up_irqinitialize(void) # ifndef CONFIG_ARM_MPU irq_attach(CXD56_IRQ_MEMFAULT, arm_memfault, NULL); # endif - irq_attach(CXD56_IRQ_BUSFAULT, cxd56_busfault, NULL); - irq_attach(CXD56_IRQ_USAGEFAULT, cxd56_usagefault, NULL); + irq_attach(CXD56_IRQ_BUSFAULT, arm_busfault, NULL); + irq_attach(CXD56_IRQ_USAGEFAULT, arm_usagefault, NULL); irq_attach(CXD56_IRQ_PENDSV, cxd56_pendsv, NULL); irq_attach(CXD56_IRQ_DBGMONITOR, cxd56_dbgmonitor, NULL); irq_attach(CXD56_IRQ_RESERVED, cxd56_reserved, NULL); diff --git a/arch/arm/src/efm32/efm32_irq.c b/arch/arm/src/efm32/efm32_irq.c index abb178ab05..53f422b6d7 100644 --- a/arch/arm/src/efm32/efm32_irq.c +++ b/arch/arm/src/efm32/efm32_irq.c @@ -132,7 +132,7 @@ static void efm32_dumpnvic(const char *msg, int irq) #endif /**************************************************************************** - * Name: efm32_nmi, efm32_busfault, efm32_usagefault, efm32_pendsv, + * Name: efm32_nmi, efm32_pendsv, * efm32_dbgmonitor, efm32_pendsv, efm32_reserved * * Description: @@ -151,22 +151,6 @@ static int efm32_nmi(int irq, void *context, void *arg) return 0; } -static int efm32_busfault(int irq, void *context, void *arg) -{ - up_irq_save(); - _err("PANIC!!! Bus fault received: %08x\n", getreg32(NVIC_CFAULTS)); - PANIC(); - return 0; -} - -static int efm32_usagefault(int irq, void *context, void *arg) -{ - up_irq_save(); - _err("PANIC!!! Usage fault received: %08x\n", getreg32(NVIC_CFAULTS)); - PANIC(); - return 0; -} - static int efm32_pendsv(int irq, void *context, void *arg) { up_irq_save(); @@ -373,8 +357,8 @@ void up_irqinitialize(void) #ifndef CONFIG_ARM_MPU irq_attach(EFM32_IRQ_MEMFAULT, arm_memfault, NULL); #endif - irq_attach(EFM32_IRQ_BUSFAULT, efm32_busfault, NULL); - irq_attach(EFM32_IRQ_USAGEFAULT, efm32_usagefault, NULL); + irq_attach(EFM32_IRQ_BUSFAULT, arm_busfault, NULL); + irq_attach(EFM32_IRQ_USAGEFAULT, arm_usagefault, NULL); irq_attach(EFM32_IRQ_PENDSV, efm32_pendsv, NULL); irq_attach(EFM32_IRQ_DBGMONITOR, efm32_dbgmonitor, NULL); irq_attach(EFM32_IRQ_RESERVED, efm32_reserved, NULL); diff --git a/arch/arm/src/eoss3/eoss3_irq.c b/arch/arm/src/eoss3/eoss3_irq.c index d6d190c5a5..2fa1b963cb 100644 --- a/arch/arm/src/eoss3/eoss3_irq.c +++ b/arch/arm/src/eoss3/eoss3_irq.c @@ -113,7 +113,7 @@ static void eoss3_dumpnvic(const char *msg, int irq) #endif /**************************************************************************** - * Name: eoss3_nmi, eoss3_busfault, eoss3_usagefault, eoss3_pendsv, + * Name: eoss3_nmi, eoss3_pendsv, * eoss3_dbgmonitor, eoss3_pendsv, eoss3_reserved * * Description: @@ -132,22 +132,6 @@ static int eoss3_nmi(int irq, void *context, void *arg) return 0; } -static int eoss3_busfault(int irq, void *context, void *arg) -{ - up_irq_save(); - _err("PANIC!!! Bus fault received: %08x\n", getreg32(NVIC_CFAULTS)); - PANIC(); - return 0; -} - -static int eoss3_usagefault(int irq, void *context, void *arg) -{ - up_irq_save(); - _err("PANIC!!! Usage fault received: %08x\n", getreg32(NVIC_CFAULTS)); - PANIC(); - return 0; -} - static int eoss3_pendsv(int irq, void *context, void *arg) { up_irq_save(); @@ -354,8 +338,8 @@ void up_irqinitialize(void) #ifndef CONFIG_ARM_MPU irq_attach(EOSS3_IRQ_MEMFAULT, arm_memfault, NULL); #endif - irq_attach(EOSS3_IRQ_BUSFAULT, eoss3_busfault, NULL); - irq_attach(EOSS3_IRQ_USAGEFAULT, eoss3_usagefault, NULL); + irq_attach(EOSS3_IRQ_BUSFAULT, arm_busfault, NULL); + irq_attach(EOSS3_IRQ_USAGEFAULT, arm_usagefault, NULL); irq_attach(EOSS3_IRQ_PENDSV, eoss3_pendsv, NULL); irq_attach(EOSS3_IRQ_DBGMONITOR, eoss3_dbgmonitor, NULL); irq_attach(EOSS3_IRQ_RESERVED, eoss3_reserved, NULL); diff --git a/arch/arm/src/gd32f4/gd32f4xx_irq.c b/arch/arm/src/gd32f4/gd32f4xx_irq.c index f7417701b2..da323d5152 100644 --- a/arch/arm/src/gd32f4/gd32f4xx_irq.c +++ b/arch/arm/src/gd32f4/gd32f4xx_irq.c @@ -138,7 +138,7 @@ static void gd32_dumpnvic(const char *msg, int irq) #endif /**************************************************************************** - * Name: gd32_nmi, gd32_busfault, gd32_usagefault, gd32_pendsv, + * Name: gd32_nmi, gd32_pendsv, * gd32_dbgmonitor, gd32_pendsv, gd32_reserved * * Description: @@ -157,24 +157,6 @@ static int gd32_nmi(int irq, void *context, void *arg) return 0; } -static int gd32_busfault(int irq, void *context, void *arg) -{ - up_irq_save(); - _err("PANIC!!! Bus fault received: %08" PRIx32 "\n", - getreg32(NVIC_CFAULTS)); - PANIC(); - return 0; -} - -static int gd32_usagefault(int irq, void *context, void *arg) -{ - up_irq_save(); - _err("PANIC!!! Usage fault received: %08" PRIx32 "\n", - getreg32(NVIC_CFAULTS)); - PANIC(); - return 0; -} - static int gd32_pendsv(int irq, void *context, void *arg) { up_irq_save(); @@ -385,8 +367,8 @@ void up_irqinitialize(void) #ifndef CONFIG_ARM_MPU irq_attach(GD32_IRQ_MEMFAULT, arm_memfault, NULL); #endif - irq_attach(GD32_IRQ_BUSFAULT, gd32_busfault, NULL); - irq_attach(GD32_IRQ_USAGEFAULT, gd32_usagefault, NULL); + irq_attach(GD32_IRQ_BUSFAULT, arm_busfault, NULL); + irq_attach(GD32_IRQ_USAGEFAULT, arm_usagefault, NULL); irq_attach(GD32_IRQ_PENDSV, gd32_pendsv, NULL); irq_attach(GD32_IRQ_DBGMONITOR, gd32_dbgmonitor, NULL); irq_attach(GD32_IRQ_RESERVED, gd32_reserved, NULL); diff --git a/arch/arm/src/imxrt/imxrt_irq.c b/arch/arm/src/imxrt/imxrt_irq.c index eb7c5ed213..aaec938dae 100644 --- a/arch/arm/src/imxrt/imxrt_irq.c +++ b/arch/arm/src/imxrt/imxrt_irq.c @@ -187,7 +187,7 @@ static void imxrt_dumpnvic(const char *msg, int irq) #endif /**************************************************************************** - * Name: imxrt_nmi, imxrt_busfault, imxrt_usagefault, imxrt_pendsv, + * Name: imxrt_nmi, imxrt_pendsv, * imxrt_dbgmonitor, imxrt_pendsv, imxrt_reserved * * Description: @@ -206,24 +206,6 @@ static int imxrt_nmi(int irq, void *context, void *arg) return 0; } -static int imxrt_busfault(int irq, void *context, void *arg) -{ - up_irq_save(); - _err("PANIC!!! Bus fault received: %08" PRIx32 "\n", - getreg32(NVIC_CFAULTS)); - PANIC(); - return 0; -} - -static int imxrt_usagefault(int irq, void *context, void *arg) -{ - up_irq_save(); - _err("PANIC!!! Usage fault received: %08" PRIx32 "\n", - getreg32(NVIC_CFAULTS)); - PANIC(); - return 0; -} - static int imxrt_pendsv(int irq, void *context, void *arg) { up_irq_save(); @@ -477,8 +459,8 @@ void up_irqinitialize(void) #ifndef CONFIG_ARM_MPU irq_attach(IMXRT_IRQ_MEMFAULT, arm_memfault, NULL); #endif - irq_attach(IMXRT_IRQ_BUSFAULT, imxrt_busfault, NULL); - irq_attach(IMXRT_IRQ_USAGEFAULT, imxrt_usagefault, NULL); + irq_attach(IMXRT_IRQ_BUSFAULT, arm_busfault, NULL); + irq_attach(IMXRT_IRQ_USAGEFAULT, arm_usagefault, NULL); irq_attach(IMXRT_IRQ_PENDSV, imxrt_pendsv, NULL); irq_attach(IMXRT_IRQ_DBGMONITOR, imxrt_dbgmonitor, NULL); irq_attach(IMXRT_IRQ_RESERVED, imxrt_reserved, NULL); diff --git a/arch/arm/src/kinetis/kinetis_irq.c b/arch/arm/src/kinetis/kinetis_irq.c index 2f5258f14c..fc90c7d717 100644 --- a/arch/arm/src/kinetis/kinetis_irq.c +++ b/arch/arm/src/kinetis/kinetis_irq.c @@ -144,7 +144,7 @@ static void kinetis_dumpnvic(const char *msg, int irq) #endif /**************************************************************************** - * Name: kinetis_nmi, kinetis_busfault, kinetis_usagefault, kinetis_pendsv, + * Name: kinetis_nmi, kinetis_pendsv, * kinetis_dbgmonitor, kinetis_pendsv, kinetis_reserved * * Description: @@ -163,22 +163,6 @@ static int kinetis_nmi(int irq, void *context, void *arg) return 0; } -static int kinetis_busfault(int irq, void *context, void *arg) -{ - up_irq_save(); - _err("PANIC!!! Bus fault received\n"); - PANIC(); - return 0; -} - -static int kinetis_usagefault(int irq, void *context, void *arg) -{ - up_irq_save(); - _err("PANIC!!! Usage fault received\n"); - PANIC(); - return 0; -} - static int kinetis_pendsv(int irq, void *context, void *arg) { up_irq_save(); @@ -404,8 +388,8 @@ void up_irqinitialize(void) #ifndef CONFIG_ARM_MPU irq_attach(KINETIS_IRQ_MEMFAULT, arm_memfault, NULL); #endif - irq_attach(KINETIS_IRQ_BUSFAULT, kinetis_busfault, NULL); - irq_attach(KINETIS_IRQ_USAGEFAULT, kinetis_usagefault, NULL); + irq_attach(KINETIS_IRQ_BUSFAULT, arm_busfault, NULL); + irq_attach(KINETIS_IRQ_USAGEFAULT, arm_usagefault, NULL); irq_attach(KINETIS_IRQ_PENDSV, kinetis_pendsv, NULL); irq_attach(KINETIS_IRQ_DBGMONITOR, kinetis_dbgmonitor, NULL); irq_attach(KINETIS_IRQ_RESERVED, kinetis_reserved, NULL); diff --git a/arch/arm/src/lc823450/lc823450_irq.c b/arch/arm/src/lc823450/lc823450_irq.c index fcb29ea8fe..3aa6b6e8a7 100644 --- a/arch/arm/src/lc823450/lc823450_irq.c +++ b/arch/arm/src/lc823450/lc823450_irq.c @@ -171,7 +171,7 @@ static void lc823450_dumpnvic(const char *msg, int irq) #endif /**************************************************************************** - * Name: lc823450_nmi, lc823450_busfault, lc823450_usagefault, + * Name: lc823450_nmi, * lc823450_pendsv, lc823450_dbgmonitor, lc823450_pendsv, * lc823450_reserved * @@ -191,22 +191,6 @@ static int lc823450_nmi(int irq, void *context, void *arg) return 0; } -static int lc823450_busfault(int irq, void *context, void *arg) -{ - enter_critical_section(); - irqinfo("PANIC!!! Bus fault received: %08x\n", getreg32(NVIC_CFAULTS)); - PANIC(); - return 0; -} - -static int lc823450_usagefault(int irq, void *context, void *arg) -{ - enter_critical_section(); - irqinfo("PANIC!!! Usage fault received: %08x\n", getreg32(NVIC_CFAULTS)); - PANIC(); - return 0; -} - static int lc823450_pendsv(int irq, void *context, void *arg) { enter_critical_section(); @@ -532,8 +516,8 @@ void up_irqinitialize(void) #ifdef CONFIG_DEBUG irq_attach(LC823450_IRQ_NMI, lc823450_nmi, NULL); - irq_attach(LC823450_IRQ_BUSFAULT, lc823450_busfault, NULL); - irq_attach(LC823450_IRQ_USAGEFAULT, lc823450_usagefault, NULL); + irq_attach(LC823450_IRQ_BUSFAULT, arm_busfault, NULL); + irq_attach(LC823450_IRQ_USAGEFAULT, arm_usagefault, NULL); irq_attach(LC823450_IRQ_PENDSV, lc823450_pendsv, NULL); irq_attach(LC823450_IRQ_DBGMONITOR, lc823450_dbgmonitor, NULL); irq_attach(LC823450_IRQ_RESERVED, lc823450_reserved, NULL); diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_irq.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_irq.c index 039cfece8a..02194b62c4 100644 --- a/arch/arm/src/lpc17xx_40xx/lpc17_40_irq.c +++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_irq.c @@ -136,22 +136,6 @@ static int lpc17_40_nmi(int irq, void *context, void *arg) return 0; } -static int lpc17_40_busfault(int irq, void *context, void *arg) -{ - up_irq_save(); - _err("PANIC!!! Bus fault received\n"); - PANIC(); - return 0; -} - -static int lpc17_40_usagefault(int irq, void *context, void *arg) -{ - up_irq_save(); - _err("PANIC!!! Usage fault received\n"); - PANIC(); - return 0; -} - static int lpc17_40_pendsv(int irq, void *context, void *arg) { up_irq_save(); @@ -374,8 +358,8 @@ void up_irqinitialize(void) #ifndef CONFIG_ARM_MPU irq_attach(LPC17_40_IRQ_MEMFAULT, arm_memfault, NULL); #endif - irq_attach(LPC17_40_IRQ_BUSFAULT, lpc17_40_busfault, NULL); - irq_attach(LPC17_40_IRQ_USAGEFAULT, lpc17_40_usagefault, NULL); + irq_attach(LPC17_40_IRQ_BUSFAULT, arm_busfault, NULL); + irq_attach(LPC17_40_IRQ_USAGEFAULT, arm_usagefault, NULL); irq_attach(LPC17_40_IRQ_PENDSV, lpc17_40_pendsv, NULL); irq_attach(LPC17_40_IRQ_DBGMONITOR, lpc17_40_dbgmonitor, NULL); irq_attach(LPC17_40_IRQ_RESERVED, lpc17_40_reserved, NULL); diff --git a/arch/arm/src/lpc43xx/lpc43_irq.c b/arch/arm/src/lpc43xx/lpc43_irq.c index 96c4a542e4..642832637a 100644 --- a/arch/arm/src/lpc43xx/lpc43_irq.c +++ b/arch/arm/src/lpc43xx/lpc43_irq.c @@ -122,7 +122,7 @@ static void lpc43_dumpnvic(const char *msg, int irq) #endif /**************************************************************************** - * Name: lpc43_nmi, lpc43_busfault, lpc43_usagefault, lpc43_pendsv, + * Name: lpc43_nmi, lpc43_pendsv, * lpc43_dbgmonitor, lpc43_pendsv, lpc43_reserved * * Description: @@ -141,22 +141,6 @@ static int lpc43_nmi(int irq, void *context, void *arg) return 0; } -static int lpc43_busfault(int irq, void *context, void *arg) -{ - up_irq_save(); - _err("PANIC!!! Bus fault received\n"); - PANIC(); - return 0; -} - -static int lpc43_usagefault(int irq, void *context, void *arg) -{ - up_irq_save(); - _err("PANIC!!! Usage fault received\n"); - PANIC(); - return 0; -} - static int lpc43_pendsv(int irq, void *context, void *arg) { up_irq_save(); @@ -367,8 +351,8 @@ void up_irqinitialize(void) #ifndef CONFIG_ARM_MPU irq_attach(LPC43_IRQ_MEMFAULT, arm_memfault, NULL); #endif - irq_attach(LPC43_IRQ_BUSFAULT, lpc43_busfault, NULL); - irq_attach(LPC43_IRQ_USAGEFAULT, lpc43_usagefault, NULL); + irq_attach(LPC43_IRQ_BUSFAULT, arm_busfault, NULL); + irq_attach(LPC43_IRQ_USAGEFAULT, arm_usagefault, NULL); irq_attach(LPC43_IRQ_PENDSV, lpc43_pendsv, NULL); irq_attach(LPC43_IRQ_DBGMONITOR, lpc43_dbgmonitor, NULL); irq_attach(LPC43_IRQ_RESERVED, lpc43_reserved, NULL); diff --git a/arch/arm/src/lpc54xx/lpc54_irq.c b/arch/arm/src/lpc54xx/lpc54_irq.c index fb3a827ffa..caba3997f8 100644 --- a/arch/arm/src/lpc54xx/lpc54_irq.c +++ b/arch/arm/src/lpc54xx/lpc54_irq.c @@ -121,7 +121,7 @@ static void lpc54_dumpnvic(const char *msg, int irq) #endif /**************************************************************************** - * Name: lpc54_nmi, lpc54_busfault, lpc54_usagefault, lpc54_pendsv, + * Name: lpc54_nmi, lpc54_pendsv, * lpc54_dbgmonitor, lpc54_pendsv, lpc54_reserved * * Description: @@ -140,22 +140,6 @@ static int lpc54_nmi(int irq, void *context, void *arg) return 0; } -static int lpc54_busfault(int irq, void *context, void *arg) -{ - up_irq_save(); - _err("PANIC!!! Bus fault received\n"); - PANIC(); - return 0; -} - -static int lpc54_usagefault(int irq, void *context, void *arg) -{ - up_irq_save(); - _err("PANIC!!! Usage fault received\n"); - PANIC(); - return 0; -} - static int lpc54_pendsv(int irq, void *context, void *arg) { up_irq_save(); @@ -367,8 +351,8 @@ void up_irqinitialize(void) #ifndef CONFIG_ARM_MPU irq_attach(LPC54_IRQ_MEMFAULT, arm_memfault, NULL); #endif - irq_attach(LPC54_IRQ_BUSFAULT, lpc54_busfault, NULL); - irq_attach(LPC54_IRQ_USAGEFAULT, lpc54_usagefault, NULL); + irq_attach(LPC54_IRQ_BUSFAULT, arm_busfault, NULL); + irq_attach(LPC54_IRQ_USAGEFAULT, arm_usagefault, NULL); irq_attach(LPC54_IRQ_PENDSV, lpc54_pendsv, NULL); irq_attach(LPC54_IRQ_DBGMONITOR, lpc54_dbgmonitor, NULL); irq_attach(LPC54_IRQ_RESERVED, lpc54_reserved, NULL); diff --git a/arch/arm/src/max326xx/common/max326_irq.c b/arch/arm/src/max326xx/common/max326_irq.c index e01db272d9..454fa1917e 100644 --- a/arch/arm/src/max326xx/common/max326_irq.c +++ b/arch/arm/src/max326xx/common/max326_irq.c @@ -122,7 +122,7 @@ static void max326_dumpnvic(const char *msg, int irq) #endif /**************************************************************************** - * Name: max326_nmi, max326_busfault, max326_usagefault, max326_pendsv, + * Name: max326_nmi, max326_pendsv, * max326_dbgmonitor, max326_pendsv, max326_reserved * * Description: @@ -141,22 +141,6 @@ static int max326_nmi(int irq, void *context, void *arg) return 0; } -static int max326_busfault(int irq, void *context, void *arg) -{ - up_irq_save(); - _err("PANIC!!! Bus fault received\n"); - PANIC(); - return 0; -} - -static int max326_usagefault(int irq, void *context, void *arg) -{ - up_irq_save(); - _err("PANIC!!! Usage fault received\n"); - PANIC(); - return 0; -} - static int max326_pendsv(int irq, void *context, void *arg) { up_irq_save(); @@ -367,8 +351,8 @@ void up_irqinitialize(void) #ifndef CONFIG_ARM_MPU irq_attach(MAX326_IRQ_MEMFAULT, arm_memfault, NULL); #endif - irq_attach(MAX326_IRQ_BUSFAULT, max326_busfault, NULL); - irq_attach(MAX326_IRQ_USAGEFAULT, max326_usagefault, NULL); + irq_attach(MAX326_IRQ_BUSFAULT, arm_busfault, NULL); + irq_attach(MAX326_IRQ_USAGEFAULT, arm_usagefault, NULL); irq_attach(MAX326_IRQ_PENDSV, max326_pendsv, NULL); irq_attach(MAX326_IRQ_DBGMONITOR, max326_dbgmonitor, NULL); irq_attach(MAX326_IRQ_RESERVED, max326_reserved, NULL); diff --git a/arch/arm/src/nrf52/nrf52_irq.c b/arch/arm/src/nrf52/nrf52_irq.c index b7fe06dca4..0b0939db45 100644 --- a/arch/arm/src/nrf52/nrf52_irq.c +++ b/arch/arm/src/nrf52/nrf52_irq.c @@ -123,7 +123,7 @@ static void nrf52_dumpnvic(const char *msg, int irq) #endif /**************************************************************************** - * Name: nrf52_nmi, nrf52_busfault, nrf52_usagefault, nrf52_pendsv, + * Name: nrf52_nmi, nrf52_pendsv, * nrf52_dbgmonitor, nrf52_pendsv, nrf52_reserved * * Description: @@ -142,22 +142,6 @@ static int nrf52_nmi(int irq, void *context, void *arg) return 0; } -static int nrf52_busfault(int irq, void *context, void *arg) -{ - up_irq_save(); - _err("PANIC!!! Bus fault received\n"); - PANIC(); - return 0; -} - -static int nrf52_usagefault(int irq, void *context, void *arg) -{ - up_irq_save(); - _err("PANIC!!! Usage fault received\n"); - PANIC(); - return 0; -} - static int nrf52_pendsv(int irq, void *context, void *arg) { up_irq_save(); @@ -371,8 +355,8 @@ void up_irqinitialize(void) #ifndef CONFIG_ARM_MPU irq_attach(NRF52_IRQ_MEMFAULT, arm_memfault, NULL); #endif - irq_attach(NRF52_IRQ_BUSFAULT, nrf52_busfault, NULL); - irq_attach(NRF52_IRQ_USAGEFAULT, nrf52_usagefault, NULL); + irq_attach(NRF52_IRQ_BUSFAULT, arm_busfault, NULL); + irq_attach(NRF52_IRQ_USAGEFAULT, arm_usagefault, NULL); irq_attach(NRF52_IRQ_PENDSV, nrf52_pendsv, NULL); irq_attach(NRF52_IRQ_DBGMONITOR, nrf52_dbgmonitor, NULL); irq_attach(NRF52_IRQ_RESERVED, nrf52_reserved, NULL); diff --git a/arch/arm/src/nrf53/nrf53_irq.c b/arch/arm/src/nrf53/nrf53_irq.c index fb958034f3..b2f1966cb6 100644 --- a/arch/arm/src/nrf53/nrf53_irq.c +++ b/arch/arm/src/nrf53/nrf53_irq.c @@ -123,7 +123,7 @@ static void nrf53_dumpnvic(const char *msg, int irq) #endif /**************************************************************************** - * Name: nrf53_nmi, nrf53_busfault, nrf53_usagefault, nrf53_pendsv, + * Name: nrf53_nmi, nrf53_pendsv, * nrf53_dbgmonitor, nrf53_pendsv, nrf53_reserved * * Description: @@ -142,22 +142,6 @@ static int nrf53_nmi(int irq, void *context, void *arg) return 0; } -static int nrf53_busfault(int irq, void *context, void *arg) -{ - up_irq_save(); - _err("PANIC!!! Bus fault received\n"); - PANIC(); - return 0; -} - -static int nrf53_usagefault(int irq, void *context, void *arg) -{ - up_irq_save(); - _err("PANIC!!! Usage fault received\n"); - PANIC(); - return 0; -} - static int nrf53_pendsv(int irq, void *context, void *arg) { up_irq_save(); @@ -371,8 +355,8 @@ void up_irqinitialize(void) #ifndef CONFIG_ARM_MPU irq_attach(NRF53_IRQ_MEMFAULT, arm_memfault, NULL); #endif - irq_attach(NRF53_IRQ_BUSFAULT, nrf53_busfault, NULL); - irq_attach(NRF53_IRQ_USAGEFAULT, nrf53_usagefault, NULL); + irq_attach(NRF53_IRQ_BUSFAULT, arm_busfault, NULL); + irq_attach(NRF53_IRQ_USAGEFAULT, arm_usagefault, NULL); irq_attach(NRF53_IRQ_PENDSV, nrf53_pendsv, NULL); irq_attach(NRF53_IRQ_DBGMONITOR, nrf53_dbgmonitor, NULL); irq_attach(NRF53_IRQ_RESERVED, nrf53_reserved, NULL); diff --git a/arch/arm/src/s32k1xx/s32k14x/s32k14x_irq.c b/arch/arm/src/s32k1xx/s32k14x/s32k14x_irq.c index af217da5c9..a6d6f23870 100644 --- a/arch/arm/src/s32k1xx/s32k14x/s32k14x_irq.c +++ b/arch/arm/src/s32k1xx/s32k14x/s32k14x_irq.c @@ -156,7 +156,7 @@ static void s32k14x_dumpnvic(const char *msg, int irq) #endif /**************************************************************************** - * Name: s32k14x_nmi, s32k14x_busfault, s32k14x_usagefault, s32k14x_pendsv, + * Name: s32k14x_nmi, s32k14x_pendsv, * s32k14x_dbgmonitor, s32k14x_pendsv, s32k14x_reserved * * Description: @@ -175,22 +175,6 @@ static int s32k14x_nmi(int irq, void *context, void *arg) return 0; } -static int s32k14x_busfault(int irq, void *context, void *arg) -{ - up_irq_save(); - _err("PANIC!!! Bus fault received\n"); - PANIC(); - return 0; -} - -static int s32k14x_usagefault(int irq, void *context, void *arg) -{ - up_irq_save(); - _err("PANIC!!! Usage fault received\n"); - PANIC(); - return 0; -} - static int s32k14x_pendsv(int irq, void *context, void *arg) { up_irq_save(); @@ -402,8 +386,8 @@ void up_irqinitialize(void) #ifndef CONFIG_ARM_MPU irq_attach(S32K1XX_IRQ_MEMFAULT, arm_memfault, NULL); #endif - irq_attach(S32K1XX_IRQ_BUSFAULT, s32k14x_busfault, NULL); - irq_attach(S32K1XX_IRQ_USAGEFAULT, s32k14x_usagefault, NULL); + irq_attach(S32K1XX_IRQ_BUSFAULT, arm_busfault, NULL); + irq_attach(S32K1XX_IRQ_USAGEFAULT, arm_usagefault, NULL); irq_attach(S32K1XX_IRQ_PENDSV, s32k14x_pendsv, NULL); irq_attach(S32K1XX_IRQ_DBGMONITOR, s32k14x_dbgmonitor, NULL); irq_attach(S32K1XX_IRQ_RESERVED, s32k14x_reserved, NULL); diff --git a/arch/arm/src/s32k3xx/s32k3xx_irq.c b/arch/arm/src/s32k3xx/s32k3xx_irq.c index 2382a0da9f..62b0f8028f 100644 --- a/arch/arm/src/s32k3xx/s32k3xx_irq.c +++ b/arch/arm/src/s32k3xx/s32k3xx_irq.c @@ -163,7 +163,7 @@ static void s32k3xx_dumpnvic(const char *msg, int irq) #endif /**************************************************************************** - * Name: s32k3xx_nmi, s32k3xx_busfault, s32k3xx_usagefault, s32k3xx_pendsv, + * Name: s32k3xx_nmi, s32k3xx_pendsv, * s32k3xx_dbgmonitor, s32k3xx_pendsv, s32k3xx_reserved * * Description: @@ -182,22 +182,6 @@ static int s32k3xx_nmi(int irq, void *context, void *arg) return 0; } -static int s32k3xx_busfault(int irq, void *context, void *arg) -{ - up_irq_save(); - _err("PANIC!!! Bus fault received\n"); - PANIC(); - return 0; -} - -static int s32k3xx_usagefault(int irq, void *context, void *arg) -{ - up_irq_save(); - _err("PANIC!!! Usage fault received\n"); - PANIC(); - return 0; -} - static int s32k3xx_pendsv(int irq, void *context, void *arg) { up_irq_save(); @@ -409,8 +393,8 @@ void up_irqinitialize(void) #ifndef CONFIG_ARM_MPU irq_attach(S32K3XX_IRQ_MEMFAULT, arm_memfault, NULL); #endif - irq_attach(S32K3XX_IRQ_BUSFAULT, s32k3xx_busfault, NULL); - irq_attach(S32K3XX_IRQ_USAGEFAULT, s32k3xx_usagefault, NULL); + irq_attach(S32K3XX_IRQ_BUSFAULT, arm_busfault, NULL); + irq_attach(S32K3XX_IRQ_USAGEFAULT, arm_usagefault, NULL); irq_attach(S32K3XX_IRQ_PENDSV, s32k3xx_pendsv, NULL); irq_attach(S32K3XX_IRQ_DBGMONITOR, s32k3xx_dbgmonitor, NULL); irq_attach(S32K3XX_IRQ_RESERVED, s32k3xx_reserved, NULL); diff --git a/arch/arm/src/sam34/sam_irq.c b/arch/arm/src/sam34/sam_irq.c index 126e399e70..770e9c2f85 100644 --- a/arch/arm/src/sam34/sam_irq.c +++ b/arch/arm/src/sam34/sam_irq.c @@ -142,7 +142,7 @@ static void sam_dumpnvic(const char *msg, int irq) #endif /**************************************************************************** - * Name: sam_nmi, sam_busfault, sam_usagefault, sam_pendsv, sam_dbgmonitor, + * Name: sam_nmi, sam_pendsv, sam_dbgmonitor, * sam_pendsv, sam_reserved * * Description: @@ -161,22 +161,6 @@ static int sam_nmi(int irq, void *context, void *arg) return 0; } -static int sam_busfault(int irq, void *context, void *arg) -{ - up_irq_save(); - _err("PANIC!!! Bus fault received: %08x\n", getreg32(NVIC_CFAULTS)); - PANIC(); - return 0; -} - -static int sam_usagefault(int irq, void *context, void *arg) -{ - up_irq_save(); - _err("PANIC!!! Usage fault received: %08x\n", getreg32(NVIC_CFAULTS)); - PANIC(); - return 0; -} - static int sam_pendsv(int irq, void *context, void *arg) { up_irq_save(); @@ -428,8 +412,8 @@ void up_irqinitialize(void) #ifndef CONFIG_ARM_MPU irq_attach(SAM_IRQ_MEMFAULT, arm_memfault, NULL); #endif - irq_attach(SAM_IRQ_BUSFAULT, sam_busfault, NULL); - irq_attach(SAM_IRQ_USAGEFAULT, sam_usagefault, NULL); + irq_attach(SAM_IRQ_BUSFAULT, arm_busfault, NULL); + irq_attach(SAM_IRQ_USAGEFAULT, arm_usagefault, NULL); irq_attach(SAM_IRQ_PENDSV, sam_pendsv, NULL); irq_attach(SAM_IRQ_DBGMONITOR, sam_dbgmonitor, NULL); irq_attach(SAM_IRQ_RESERVED, sam_reserved, NULL); diff --git a/arch/arm/src/samd5e5/sam_irq.c b/arch/arm/src/samd5e5/sam_irq.c index 8aa11ef390..58b89ea462 100644 --- a/arch/arm/src/samd5e5/sam_irq.c +++ b/arch/arm/src/samd5e5/sam_irq.c @@ -180,7 +180,7 @@ static void sam_dumpnvic(const char *msg, int irq) #endif /**************************************************************************** - * Name: sam_nmi, sam_busfault, sam_usagefault, sam_pendsv, sam_dbgmonitor, + * Name: sam_nmi, sam_pendsv, sam_dbgmonitor, * sam_pendsv, sam_reserved * * Description: @@ -199,22 +199,6 @@ static int sam_nmi(int irq, void *context, void *arg) return 0; } -static int sam_busfault(int irq, void *context, void *arg) -{ - up_irq_save(); - _err("PANIC!!! Bus fault received: %08x\n", getreg32(NVIC_CFAULTS)); - PANIC(); - return 0; -} - -static int sam_usagefault(int irq, void *context, void *arg) -{ - up_irq_save(); - _err("PANIC!!! Usage fault received: %08x\n", getreg32(NVIC_CFAULTS)); - PANIC(); - return 0; -} - static int sam_pendsv(int irq, void *context, void *arg) { up_irq_save(); @@ -515,8 +499,8 @@ void up_irqinitialize(void) #ifndef CONFIG_ARM_MPU irq_attach(SAM_IRQ_MEMFAULT, arm_memfault, NULL); #endif - irq_attach(SAM_IRQ_BUSFAULT, sam_busfault, NULL); - irq_attach(SAM_IRQ_USAGEFAULT, sam_usagefault, NULL); + irq_attach(SAM_IRQ_BUSFAULT, arm_busfault, NULL); + irq_attach(SAM_IRQ_USAGEFAULT, arm_usagefault, NULL); irq_attach(SAM_IRQ_PENDSV, sam_pendsv, NULL); irq_attach(SAM_IRQ_DBGMONITOR, sam_dbgmonitor, NULL); irq_attach(SAM_IRQ_RESERVED, sam_reserved, NULL); diff --git a/arch/arm/src/samv7/sam_irq.c b/arch/arm/src/samv7/sam_irq.c index fddb44512c..8a270dbb81 100644 --- a/arch/arm/src/samv7/sam_irq.c +++ b/arch/arm/src/samv7/sam_irq.c @@ -142,7 +142,7 @@ static void sam_dumpnvic(const char *msg, int irq) #endif /**************************************************************************** - * Name: sam_nmi, sam_busfault, sam_usagefault, sam_pendsv, sam_dbgmonitor, + * Name: sam_nmi, sam_pendsv, sam_dbgmonitor, * sam_pendsv, sam_reserved * * Description: @@ -170,23 +170,6 @@ static int sam_busfault(int irq, void *context, void *arg) return 0; } -static int sam_usagefault(int irq, void *context, void *arg) -{ - up_irq_save(); - _err("PANIC!!! Usage fault received: %08" PRIx32 "\n", - getreg32(NVIC_CFAULTS)); - PANIC(); - return 0; -} - -static int sam_pendsv(int irq, void *context, void *arg) -{ - up_irq_save(); - _err("PANIC!!! PendSV received\n"); - PANIC(); - return 0; -} - static int sam_dbgmonitor(int irq, void *context, void *arg) { up_irq_save(); @@ -430,8 +413,8 @@ void up_irqinitialize(void) #ifndef CONFIG_ARM_MPU irq_attach(SAM_IRQ_MEMFAULT, arm_memfault, NULL); #endif - irq_attach(SAM_IRQ_BUSFAULT, sam_busfault, NULL); - irq_attach(SAM_IRQ_USAGEFAULT, sam_usagefault, NULL); + irq_attach(SAM_IRQ_BUSFAULT, arm_busfault, NULL); + irq_attach(SAM_IRQ_USAGEFAULT, arm_usagefault, NULL); irq_attach(SAM_IRQ_PENDSV, sam_pendsv, NULL); irq_attach(SAM_IRQ_DBGMONITOR, sam_dbgmonitor, NULL); irq_attach(SAM_IRQ_RESERVED, sam_reserved, NULL); diff --git a/arch/arm/src/stm32/stm32_irq.c b/arch/arm/src/stm32/stm32_irq.c index 045539eb87..03432dd7e0 100644 --- a/arch/arm/src/stm32/stm32_irq.c +++ b/arch/arm/src/stm32/stm32_irq.c @@ -128,7 +128,7 @@ static void stm32_dumpnvic(const char *msg, int irq) #endif /**************************************************************************** - * Name: stm32_nmi, stm32_busfault, stm32_usagefault, stm32_pendsv, + * Name: stm32_nmi, stm32_pendsv, * stm32_dbgmonitor, stm32_pendsv, stm32_reserved * * Description: @@ -147,24 +147,6 @@ static int stm32_nmi(int irq, void *context, void *arg) return 0; } -static int stm32_busfault(int irq, void *context, void *arg) -{ - up_irq_save(); - _err("PANIC!!! Bus fault received: %08" PRIx32 "\n", - getreg32(NVIC_CFAULTS)); - PANIC(); - return 0; -} - -static int stm32_usagefault(int irq, void *context, void *arg) -{ - up_irq_save(); - _err("PANIC!!! Usage fault received: %08" PRIx32 "\n", - getreg32(NVIC_CFAULTS)); - PANIC(); - return 0; -} - static int stm32_pendsv(int irq, void *context, void *arg) { up_irq_save(); @@ -377,8 +359,8 @@ void up_irqinitialize(void) #ifndef CONFIG_ARM_MPU irq_attach(STM32_IRQ_MEMFAULT, arm_memfault, NULL); #endif - irq_attach(STM32_IRQ_BUSFAULT, stm32_busfault, NULL); - irq_attach(STM32_IRQ_USAGEFAULT, stm32_usagefault, NULL); + irq_attach(STM32_IRQ_BUSFAULT, arm_busfault, NULL); + irq_attach(STM32_IRQ_USAGEFAULT, arm_usagefault, NULL); irq_attach(STM32_IRQ_PENDSV, stm32_pendsv, NULL); irq_attach(STM32_IRQ_DBGMONITOR, stm32_dbgmonitor, NULL); irq_attach(STM32_IRQ_RESERVED, stm32_reserved, NULL); diff --git a/arch/arm/src/stm32f7/stm32_irq.c b/arch/arm/src/stm32f7/stm32_irq.c index 3b775a4da6..8111e5c679 100644 --- a/arch/arm/src/stm32f7/stm32_irq.c +++ b/arch/arm/src/stm32f7/stm32_irq.c @@ -164,7 +164,7 @@ static void stm32_dumpnvic(const char *msg, int irq) #endif /**************************************************************************** - * Name: stm32_nmi, stm32_busfault, stm32_usagefault, stm32_pendsv, + * Name: stm32_nmi, stm32_pendsv, * stm32_dbgmonitor, stm32_pendsv, stm32_reserved * * Description: @@ -183,24 +183,6 @@ static int stm32_nmi(int irq, void *context, void *arg) return 0; } -static int stm32_busfault(int irq, void *context, void *arg) -{ - up_irq_save(); - _err("PANIC!!! Bus fault received: %08" PRIx32 "\n", - getreg32(NVIC_CFAULTS)); - PANIC(); - return 0; -} - -static int stm32_usagefault(int irq, void *context, void *arg) -{ - up_irq_save(); - _err("PANIC!!! Usage fault received: %08" PRIx32 "\n", - getreg32(NVIC_CFAULTS)); - PANIC(); - return 0; -} - static int stm32_pendsv(int irq, void *context, void *arg) { up_irq_save(); @@ -474,8 +456,8 @@ void up_irqinitialize(void) #ifndef CONFIG_ARM_MPU irq_attach(STM32_IRQ_MEMFAULT, arm_memfault, NULL); #endif - irq_attach(STM32_IRQ_BUSFAULT, stm32_busfault, NULL); - irq_attach(STM32_IRQ_USAGEFAULT, stm32_usagefault, NULL); + irq_attach(STM32_IRQ_BUSFAULT, arm_busfault, NULL); + irq_attach(STM32_IRQ_USAGEFAULT, arm_usagefault, NULL); irq_attach(STM32_IRQ_PENDSV, stm32_pendsv, NULL); irq_attach(STM32_IRQ_DBGMONITOR, stm32_dbgmonitor, NULL); irq_attach(STM32_IRQ_RESERVED, stm32_reserved, NULL); diff --git a/arch/arm/src/stm32h7/stm32_irq.c b/arch/arm/src/stm32h7/stm32_irq.c index 2f1e4ee4af..3dd99295a6 100644 --- a/arch/arm/src/stm32h7/stm32_irq.c +++ b/arch/arm/src/stm32h7/stm32_irq.c @@ -159,7 +159,7 @@ static void stm32_dumpnvic(const char *msg, int irq) #endif /**************************************************************************** - * Name: stm32_nmi, stm32_busfault, stm32_usagefault, stm32_pendsv, + * Name: stm32_nmi, stm32_pendsv, * stm32_dbgmonitor, stm32_pendsv, stm32_reserved * * Description: @@ -178,22 +178,6 @@ static int stm32_nmi(int irq, void *context, void *arg) return 0; } -static int stm32_busfault(int irq, void *context, void *arg) -{ - up_irq_save(); - _err("PANIC!!! Bus fault received: %08x\n", getreg32(NVIC_CFAULTS)); - PANIC(); - return 0; -} - -static int stm32_usagefault(int irq, void *context, void *arg) -{ - up_irq_save(); - _err("PANIC!!! Usage fault received: %08x\n", getreg32(NVIC_CFAULTS)); - PANIC(); - return 0; -} - static int stm32_pendsv(int irq, void *context, void *arg) { up_irq_save(); @@ -494,8 +478,8 @@ void up_irqinitialize(void) #ifndef CONFIG_ARM_MPU irq_attach(STM32_IRQ_MEMFAULT, arm_memfault, NULL); #endif - irq_attach(STM32_IRQ_BUSFAULT, stm32_busfault, NULL); - irq_attach(STM32_IRQ_USAGEFAULT, stm32_usagefault, NULL); + irq_attach(STM32_IRQ_BUSFAULT, arm_busfault, NULL); + irq_attach(STM32_IRQ_USAGEFAULT, arm_usagefault, NULL); irq_attach(STM32_IRQ_PENDSV, stm32_pendsv, NULL); irq_attach(STM32_IRQ_DBGMONITOR, stm32_dbgmonitor, NULL); irq_attach(STM32_IRQ_RESERVED, stm32_reserved, NULL); diff --git a/arch/arm/src/stm32l4/stm32l4_irq.c b/arch/arm/src/stm32l4/stm32l4_irq.c index b602f3cdc6..7a40ba8ed8 100644 --- a/arch/arm/src/stm32l4/stm32l4_irq.c +++ b/arch/arm/src/stm32l4/stm32l4_irq.c @@ -125,7 +125,7 @@ static void stm32l4_dumpnvic(const char *msg, int irq) #endif /**************************************************************************** - * Name: stm32l4_nmi, stm32l4_busfault, stm32l4_usagefault, stm32l4_pendsv, + * Name: stm32l4_nmi, stm32l4_pendsv, * stm32l4_dbgmonitor, stm32l4_pendsv, stm32l4_reserved * * Description: @@ -144,22 +144,6 @@ static int stm32l4_nmi(int irq, void *context, void *arg) return 0; } -static int stm32l4_busfault(int irq, void *context, void *arg) -{ - up_irq_save(); - _err("PANIC!!! Bus fault received: %08x\n", getreg32(NVIC_CFAULTS)); - PANIC(); - return 0; -} - -static int stm32l4_usagefault(int irq, void *context, void *arg) -{ - up_irq_save(); - _err("PANIC!!! Usage fault received: %08x\n", getreg32(NVIC_CFAULTS)); - PANIC(); - return 0; -} - static int stm32l4_pendsv(int irq, void *context, void *arg) { up_irq_save(); @@ -362,8 +346,8 @@ void up_irqinitialize(void) #ifndef CONFIG_ARM_MPU irq_attach(STM32L4_IRQ_MEMFAULT, arm_memfault, NULL); #endif - irq_attach(STM32L4_IRQ_BUSFAULT, stm32l4_busfault, NULL); - irq_attach(STM32L4_IRQ_USAGEFAULT, stm32l4_usagefault, NULL); + irq_attach(STM32L4_IRQ_BUSFAULT, arm_busfault, NULL); + irq_attach(STM32L4_IRQ_USAGEFAULT, arm_usagefault, NULL); irq_attach(STM32L4_IRQ_PENDSV, stm32l4_pendsv, NULL); irq_attach(STM32L4_IRQ_DBGMONITOR, stm32l4_dbgmonitor, NULL); irq_attach(STM32L4_IRQ_RESERVED, stm32l4_reserved, NULL); diff --git a/arch/arm/src/stm32l5/stm32l5_irq.c b/arch/arm/src/stm32l5/stm32l5_irq.c index 1876ca57b6..b93dd26c2f 100644 --- a/arch/arm/src/stm32l5/stm32l5_irq.c +++ b/arch/arm/src/stm32l5/stm32l5_irq.c @@ -110,7 +110,7 @@ static void stm32l5_dumpnvic(const char *msg, int irq) #endif /**************************************************************************** - * Name: stm32l5_nmi, stm32l5_busfault, stm32l5_usagefault, stm32l5_pendsv, + * Name: stm32l5_nmi, stm32l5_pendsv, * stm32l5_dbgmonitor, stm32l5_pendsv, stm32l5_reserved * * Description: @@ -129,22 +129,6 @@ static int stm32l5_nmi(int irq, void *context, void *arg) return 0; } -static int stm32l5_busfault(int irq, void *context, void *arg) -{ - up_irq_save(); - _err("PANIC!!! Bus fault received: %08x\n", getreg32(NVIC_CFAULTS)); - PANIC(); - return 0; -} - -static int stm32l5_usagefault(int irq, void *context, void *arg) -{ - up_irq_save(); - _err("PANIC!!! Usage fault received: %08x\n", getreg32(NVIC_CFAULTS)); - PANIC(); - return 0; -} - static int stm32l5_pendsv(int irq, void *context, void *arg) { up_irq_save(); @@ -349,8 +333,8 @@ void up_irqinitialize(void) #ifndef CONFIG_ARM_MPU irq_attach(STM32L5_IRQ_MEMFAULT, arm_memfault, NULL); #endif - irq_attach(STM32L5_IRQ_BUSFAULT, stm32l5_busfault, NULL); - irq_attach(STM32L5_IRQ_USAGEFAULT, stm32l5_usagefault, NULL); + irq_attach(STM32L5_IRQ_BUSFAULT, arm_busfault, NULL); + irq_attach(STM32L5_IRQ_USAGEFAULT, arm_usagefault, NULL); irq_attach(STM32L5_IRQ_PENDSV, stm32l5_pendsv, NULL); irq_attach(STM32L5_IRQ_DBGMONITOR, stm32l5_dbgmonitor, NULL); irq_attach(STM32L5_IRQ_RESERVED, stm32l5_reserved, NULL); diff --git a/arch/arm/src/stm32u5/stm32_irq.c b/arch/arm/src/stm32u5/stm32_irq.c index 528d51cff7..239d414bec 100644 --- a/arch/arm/src/stm32u5/stm32_irq.c +++ b/arch/arm/src/stm32u5/stm32_irq.c @@ -110,7 +110,7 @@ static void stm32_dumpnvic(const char *msg, int irq) #endif /**************************************************************************** - * Name: stm32_nmi, stm32_busfault, stm32_usagefault, stm32_pendsv, + * Name: stm32_nmi, stm32_pendsv, * stm32_dbgmonitor, stm32_pendsv, stm32_reserved * * Description: @@ -129,22 +129,6 @@ static int stm32_nmi(int irq, void *context, void *arg) return 0; } -static int stm32_busfault(int irq, void *context, void *arg) -{ - up_irq_save(); - _err("PANIC!!! Bus fault received: %08x\n", getreg32(NVIC_CFAULTS)); - PANIC(); - return 0; -} - -static int stm32_usagefault(int irq, void *context, void *arg) -{ - up_irq_save(); - _err("PANIC!!! Usage fault received: %08x\n", getreg32(NVIC_CFAULTS)); - PANIC(); - return 0; -} - static int stm32_pendsv(int irq, void *context, void *arg) { up_irq_save(); @@ -349,8 +333,8 @@ void up_irqinitialize(void) #ifndef CONFIG_ARM_MPU irq_attach(STM32_IRQ_MEMFAULT, arm_memfault, NULL); #endif - irq_attach(STM32_IRQ_BUSFAULT, stm32_busfault, NULL); - irq_attach(STM32_IRQ_USAGEFAULT, stm32_usagefault, NULL); + irq_attach(STM32_IRQ_BUSFAULT, arm_busfault, NULL); + irq_attach(STM32_IRQ_USAGEFAULT, arm_usagefault, NULL); irq_attach(STM32_IRQ_PENDSV, stm32_pendsv, NULL); irq_attach(STM32_IRQ_DBGMONITOR, stm32_dbgmonitor, NULL); irq_attach(STM32_IRQ_RESERVED, stm32_reserved, NULL); diff --git a/arch/arm/src/stm32wb/stm32wb_irq.c b/arch/arm/src/stm32wb/stm32wb_irq.c index 3e8578ddae..f4ffe0e68d 100644 --- a/arch/arm/src/stm32wb/stm32wb_irq.c +++ b/arch/arm/src/stm32wb/stm32wb_irq.c @@ -126,7 +126,7 @@ static void stm32wb_dumpnvic(const char *msg, int irq) #endif /**************************************************************************** - * Name: stm32wb_nmi, stm32wb_busfault, stm32wb_usagefault, stm32wb_pendsv, + * Name: stm32wb_nmi, stm32wb_pendsv, * stm32wb_dbgmonitor, stm32wb_pendsv, stm32wb_reserved * * Description: @@ -145,24 +145,6 @@ static int stm32wb_nmi(int irq, void *context, void *arg) return 0; } -static int stm32wb_busfault(int irq, void *context, void *arg) -{ - up_irq_save(); - _err("PANIC!!! Bus fault received: %08" PRIx32 "\n", - getreg32(NVIC_CFAULTS)); - PANIC(); - return 0; -} - -static int stm32wb_usagefault(int irq, void *context, void *arg) -{ - up_irq_save(); - _err("PANIC!!! Usage fault received: %08" PRIx32 "\n", - getreg32(NVIC_CFAULTS)); - PANIC(); - return 0; -} - static int stm32wb_pendsv(int irq, void *context, void *arg) { up_irq_save(); @@ -369,8 +351,8 @@ void up_irqinitialize(void) #ifndef CONFIG_ARM_MPU irq_attach(STM32WB_IRQ_MEMFAULT, arm_memfault, NULL); #endif - irq_attach(STM32WB_IRQ_BUSFAULT, stm32wb_busfault, NULL); - irq_attach(STM32WB_IRQ_USAGEFAULT, stm32wb_usagefault, NULL); + irq_attach(STM32WB_IRQ_BUSFAULT, arm_busfault, NULL); + irq_attach(STM32WB_IRQ_USAGEFAULT, arm_usagefault, NULL); irq_attach(STM32WB_IRQ_PENDSV, stm32wb_pendsv, NULL); irq_attach(STM32WB_IRQ_DBGMONITOR, stm32wb_dbgmonitor, NULL); irq_attach(STM32WB_IRQ_RESERVED, stm32wb_reserved, NULL); diff --git a/arch/arm/src/stm32wl5/stm32wl5_irq.c b/arch/arm/src/stm32wl5/stm32wl5_irq.c index 5848b53d46..c4107c491a 100644 --- a/arch/arm/src/stm32wl5/stm32wl5_irq.c +++ b/arch/arm/src/stm32wl5/stm32wl5_irq.c @@ -126,9 +126,8 @@ static void stm32wl5_dumpnvic(const char *msg, int irq) #endif /**************************************************************************** - * Name: stm32wl5_nmi, stm32wl5_busfault, stm32wl5_usagefault, - * stm32wl5_pendsv, stm32wl5_dbgmonitor, stm32wl5_pendsv, - * stm32wl5_reserved + * Name: stm32wl5_nmi, stm32wl5_pendsv, + * stm32wl5_dbgmonitor, stm32wl5_pendsv, stm32wl5_reserved * * Description: * Handlers for various exceptions. None are handled and all are fatal @@ -146,24 +145,6 @@ static int stm32wl5_nmi(int irq, void *context, void *arg) return 0; } -static int stm32wl5_busfault(int irq, void *context, void *arg) -{ - up_irq_save(); - _err("PANIC!!! Bus fault received: %08x\n", - (unsigned int)getreg32(NVIC_CFAULTS)); - PANIC(); - return 0; -} - -static int stm32wl5_usagefault(int irq, void *context, void *arg) -{ - up_irq_save(); - _err("PANIC!!! Usage fault received: %08x\n", - (unsigned int)getreg32(NVIC_CFAULTS)); - PANIC(); - return 0; -} - static int stm32wl5_pendsv(int irq, void *context, void *arg) { up_irq_save(); @@ -366,8 +347,8 @@ void up_irqinitialize(void) #ifndef CONFIG_ARM_MPU irq_attach(STM32WL5_IRQ_MEMFAULT, arm_memfault, NULL); #endif - irq_attach(STM32WL5_IRQ_BUSFAULT, stm32wl5_busfault, NULL); - irq_attach(STM32WL5_IRQ_USAGEFAULT, stm32wl5_usagefault, NULL); + irq_attach(STM32WL5_IRQ_BUSFAULT, arm_busfault, NULL); + irq_attach(STM32WL5_IRQ_USAGEFAULT, arm_usagefault, NULL); irq_attach(STM32WL5_IRQ_PENDSV, stm32wl5_pendsv, NULL); irq_attach(STM32WL5_IRQ_DBGMONITOR, stm32wl5_dbgmonitor, NULL); irq_attach(STM32WL5_IRQ_RESERVED, stm32wl5_reserved, NULL); diff --git a/arch/arm/src/tiva/common/tiva_irq.c b/arch/arm/src/tiva/common/tiva_irq.c index 47b5427132..6445a40078 100644 --- a/arch/arm/src/tiva/common/tiva_irq.c +++ b/arch/arm/src/tiva/common/tiva_irq.c @@ -193,7 +193,7 @@ static void tiva_dumpnvic(const char *msg, int irq) #endif /**************************************************************************** - * Name: tiva_nmi, tiva_busfault, tiva_usagefault, tiva_pendsv, + * Name: tiva_nmi, tiva_pendsv, * tiva_dbgmonitor, tiva_pendsv, tiva_reserved * * Description: @@ -212,22 +212,6 @@ static int tiva_nmi(int irq, void *context, void *arg) return 0; } -static int tiva_busfault(int irq, void *context, void *arg) -{ - up_irq_save(); - _err("PANIC!!! Bus fault received\n"); - PANIC(); - return 0; -} - -static int tiva_usagefault(int irq, void *context, void *arg) -{ - up_irq_save(); - _err("PANIC!!! Usage fault received\n"); - PANIC(); - return 0; -} - static int tiva_pendsv(int irq, void *context, void *arg) { up_irq_save(); @@ -492,8 +476,8 @@ void up_irqinitialize(void) #ifndef CONFIG_ARM_MPU irq_attach(TIVA_IRQ_MEMFAULT, arm_memfault, NULL); #endif - irq_attach(TIVA_IRQ_BUSFAULT, tiva_busfault, NULL); - irq_attach(TIVA_IRQ_USAGEFAULT, tiva_usagefault, NULL); + irq_attach(TIVA_IRQ_BUSFAULT, arm_busfault, NULL); + irq_attach(TIVA_IRQ_USAGEFAULT, arm_usagefault, NULL); irq_attach(TIVA_IRQ_PENDSV, tiva_pendsv, NULL); irq_attach(TIVA_IRQ_DBGMONITOR, tiva_dbgmonitor, NULL); irq_attach(TIVA_IRQ_RESERVED, tiva_reserved, NULL); diff --git a/arch/arm/src/xmc4/xmc4_irq.c b/arch/arm/src/xmc4/xmc4_irq.c index fe66ad0178..907ad0dbef 100644 --- a/arch/arm/src/xmc4/xmc4_irq.c +++ b/arch/arm/src/xmc4/xmc4_irq.c @@ -143,7 +143,7 @@ static void xmc4_dump_nvic(const char *msg, int irq) #endif /**************************************************************************** - * Name: xmc4_nmi, xmc4_busfault, xmc4_usagefault, xmc4_pendsv, + * Name: xmc4_nmi, xmc4_pendsv, * xmc4_dbgmonitor, xmc4_pendsv, xmc4_reserved * * Description: @@ -162,22 +162,6 @@ static int xmc4_nmi(int irq, void *context, void *arg) return 0; } -static int xmc4_busfault(int irq, void *context, void *arg) -{ - up_irq_save(); - _err("PANIC!!! Bus fault received\n"); - PANIC(); - return 0; -} - -static int xmc4_usagefault(int irq, void *context, void *arg) -{ - up_irq_save(); - _err("PANIC!!! Usage fault received\n"); - PANIC(); - return 0; -} - static int xmc4_pendsv(int irq, void *context, void *arg) { up_irq_save(); @@ -406,8 +390,8 @@ void up_irqinitialize(void) #ifndef CONFIG_ARM_MPU irq_attach(XMC4_IRQ_MEMFAULT, arm_memfault, NULL); #endif - irq_attach(XMC4_IRQ_BUSFAULT, xmc4_busfault, NULL); - irq_attach(XMC4_IRQ_USAGEFAULT, xmc4_usagefault, NULL); + irq_attach(XMC4_IRQ_BUSFAULT, arm_busfault, NULL); + irq_attach(XMC4_IRQ_USAGEFAULT, arm_usagefault, NULL); irq_attach(XMC4_IRQ_PENDSV, xmc4_pendsv, NULL); irq_attach(XMC4_IRQ_DBGMONITOR, xmc4_dbgmonitor, NULL); irq_attach(XMC4_IRQ_RESERVED, xmc4_reserved, NULL);
