diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2015-02-09 16:12:11 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2015-02-09 16:12:11 -0600 |
| commit | 87b3ae4e294e547dbc9aab6134efbd693267a261 (patch) | |
| tree | 37681559e481c01c22e8b61c596b74fd5d0eede6 /nuttx/arch/z16/src/common/up_doirq.c | |
| parent | 90a63664425e57c628d18e4ea71ccc6138c23948 (diff) | |
| download | px4-nuttx-87b3ae4e294e547dbc9aab6134efbd693267a261.tar.gz px4-nuttx-87b3ae4e294e547dbc9aab6134efbd693267a261.tar.bz2 px4-nuttx-87b3ae4e294e547dbc9aab6134efbd693267a261.zip | |
Big, very risky change: Remove all occurrences of up_maskack_irq() that disable and enable interrupts with up_ack_irq() that only acknowledges the interrupts. This is only used in interrupt decoding logic. Also remove the logic that unconditionally re-enables interrupts with the interrupt exits. This interferes with the drivers ability to control the interrupt state. This is a necessary, sweeping, global change and unfortunately impossible to test.
Diffstat (limited to 'nuttx/arch/z16/src/common/up_doirq.c')
| -rw-r--r-- | nuttx/arch/z16/src/common/up_doirq.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/nuttx/arch/z16/src/common/up_doirq.c b/nuttx/arch/z16/src/common/up_doirq.c index 7e9a3fd9f..38290a47a 100644 --- a/nuttx/arch/z16/src/common/up_doirq.c +++ b/nuttx/arch/z16/src/common/up_doirq.c @@ -106,9 +106,9 @@ FAR chipreg_t *up_doirq(int irq, FAR chipreg_t *regs) savestate = (FAR chipreg_t *)current_regs; current_regs = regs; - /* Mask and acknowledge the interrupt */ + /* Acknowledge the interrupt */ - up_maskack_irq(irq); + up_ack_irq(irq); /* Deliver the IRQ */ @@ -121,12 +121,6 @@ FAR chipreg_t *up_doirq(int irq, FAR chipreg_t *regs) ret = current_regs; current_regs = savestate; - - /* Unmask the last interrupt (global interrupts are still - * disabled. - */ - - up_enable_irq(irq); } board_led_off(LED_INIRQ); |