diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2013-04-16 18:29:01 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2013-04-16 18:29:01 -0600 |
| commit | 6d5aa3f0eb6a82a8d095389bd0f52bf10ef69250 (patch) | |
| tree | fb65f9ee223ef1703456d06c871fd39cf075e347 /nuttx/arch/arm | |
| parent | 9255670a9d9fab07e941008aa9e9edbf5b460c0b (diff) | |
| download | nuttx-6d5aa3f0eb6a82a8d095389bd0f52bf10ef69250.tar.gz nuttx-6d5aa3f0eb6a82a8d095389bd0f52bf10ef69250.tar.bz2 nuttx-6d5aa3f0eb6a82a8d095389bd0f52bf10ef69250.zip | |
Addition cleanup after last switch from BASEPRI to PRIMASK for Cortex-M0
Diffstat (limited to 'nuttx/arch/arm')
| -rw-r--r-- | nuttx/arch/arm/src/armv6-m/up_hardfault.c | 7 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/kl/kl_irq.c | 6 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/nuc1xx/nuc_irq.c | 6 |
3 files changed, 1 insertions, 18 deletions
diff --git a/nuttx/arch/arm/src/armv6-m/up_hardfault.c b/nuttx/arch/arm/src/armv6-m/up_hardfault.c index 19c63e77b..049f71d05 100644 --- a/nuttx/arch/arm/src/armv6-m/up_hardfault.c +++ b/nuttx/arch/arm/src/armv6-m/up_hardfault.c @@ -90,18 +90,14 @@ int up_hardfault(int irq, FAR void *context) { -#if defined(CONFIG_DEBUG_HARDFAULT) || !defined(CONFIG_ARMV7M_USEBASEPRI) uint32_t *regs = (uint32_t*)context; -#endif /* Get the value of the program counter where the fault occurred */ -#ifndef CONFIG_ARMV7M_USEBASEPRI uint16_t *pc = (uint16_t*)regs[REG_PC] - 1; /* Check if the pc lies in known FLASH memory. - * REVISIT: What if the PC lies in "unknown" external memory? Best - * use the BASEPRI register if you have external memory. + * REVISIT: What if the PC lies in "unknown" external memory? */ #ifdef CONFIG_NUTTX_KERNEL @@ -135,7 +131,6 @@ int up_hardfault(int irq, FAR void *context) return up_svcall(irq, context); } } -#endif #if defined(CONFIG_DEBUG_HARDFAULT) /* Dump some hard fault info */ diff --git a/nuttx/arch/arm/src/kl/kl_irq.c b/nuttx/arch/arm/src/kl/kl_irq.c index 7adc438db..a400c2cae 100644 --- a/nuttx/arch/arm/src/kl/kl_irq.c +++ b/nuttx/arch/arm/src/kl/kl_irq.c @@ -230,12 +230,6 @@ void up_irqinitialize(void) irq_attach(KL_IRQ_SVCALL, up_svcall); irq_attach(KL_IRQ_HARDFAULT, up_hardfault); - /* Set the priority of the SVCall interrupt */ - -#ifdef CONFIG_ARCH_IRQPRIO -/* up_prioritize_irq(KL_IRQ_PENDSV, NVIC_SYSH_PRIORITY_MIN); */ -#endif - /* Attach all other processor exceptions (except reset and sys tick) */ #ifdef CONFIG_DEBUG diff --git a/nuttx/arch/arm/src/nuc1xx/nuc_irq.c b/nuttx/arch/arm/src/nuc1xx/nuc_irq.c index d80bfe16f..01a7bd7ba 100644 --- a/nuttx/arch/arm/src/nuc1xx/nuc_irq.c +++ b/nuttx/arch/arm/src/nuc1xx/nuc_irq.c @@ -230,12 +230,6 @@ void up_irqinitialize(void) irq_attach(NUC_IRQ_SVCALL, up_svcall); irq_attach(NUC_IRQ_HARDFAULT, up_hardfault); - /* Set the priority of the SVCall interrupt */ - -#ifdef CONFIG_ARCH_IRQPRIO -/* up_prioritize_irq(NUC_IRQ_PENDSV, NVIC_SYSH_PRIORITY_MIN); */ -#endif - /* Attach all other processor exceptions (except reset and sys tick) */ #ifdef CONFIG_DEBUG |