diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2013-02-23 15:04:49 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2013-02-23 15:04:49 +0000 |
| commit | 1656c2b76f95f552837acdb44290ac1b32e3b58e (patch) | |
| tree | d615e262e71e31518cb198958c65eb30c4b7d841 /nuttx/arch/arm/src/armv6-m/up_hardfault.c | |
| parent | f6cc3cf96afa3b5fd0d633fe532f45316da4bdad (diff) | |
| download | px4-nuttx-1656c2b76f95f552837acdb44290ac1b32e3b58e.tar.gz px4-nuttx-1656c2b76f95f552837acdb44290ac1b32e3b58e.tar.bz2 px4-nuttx-1656c2b76f95f552837acdb44290ac1b32e3b58e.zip | |
Fixes for NuTiny-NUC120 configuration and build
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5666 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/arm/src/armv6-m/up_hardfault.c')
| -rw-r--r-- | nuttx/arch/arm/src/armv6-m/up_hardfault.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/nuttx/arch/arm/src/armv6-m/up_hardfault.c b/nuttx/arch/arm/src/armv6-m/up_hardfault.c index 48eecb947..afbcda9c2 100644 --- a/nuttx/arch/arm/src/armv6-m/up_hardfault.c +++ b/nuttx/arch/arm/src/armv6-m/up_hardfault.c @@ -1,7 +1,7 @@ /**************************************************************************** * arch/arm/src/armv6-m/up_hardfault.c * - * Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved. + * Copyright (C) 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without @@ -92,7 +92,6 @@ int up_hardfault(int irq, FAR void *context) { #if defined(CONFIG_DEBUG_HARDFAULT) uint32_t *regs = (uint32_t*)context; -#endif /* Dump some hard fault info */ @@ -100,10 +99,6 @@ int up_hardfault(int irq, FAR void *context) hfdbg(" IRQ: %d regs: %p\n", irq, regs); hfdbg(" BASEPRI: %08x PRIMASK: %08x IPSR: %08x\n", getbasepri(), getprimask(), getipsr()); - hfdbg(" CFAULTS: %08x HFAULTS: %08x DFAULTS: %08x BFAULTADDR: %08x AFAULTS: %08x\n", - getreg32(NVIC_CFAULTS), getreg32(NVIC_HFAULTS), - getreg32(NVIC_DFAULTS), getreg32(NVIC_BFAULT_ADDR), - getreg32(NVIC_AFAULTS)); hfdbg(" R0: %08x %08x %08x %08x %08x %08x %08x %08x\n", regs[REG_R0], regs[REG_R1], regs[REG_R2], regs[REG_R3], regs[REG_R4], regs[REG_R5], regs[REG_R6], regs[REG_R7]); @@ -112,9 +107,10 @@ int up_hardfault(int irq, FAR void *context) regs[REG_R12], regs[REG_R13], regs[REG_R14], regs[REG_R15]); hfdbg(" xPSR: %08x BASEPRI: %08x (saved)\n", current_regs[REG_XPSR], current_regs[REG_BASEPRI]); +#endif (void)irqsave(); - lldbg("PANIC!!! Hard fault: %08x\n", getreg32(NVIC_HFAULTS)); + lldbg("PANIC!!! Hard fault\n"); PANIC(OSERR_UNEXPECTEDISR); return OK; } |