summaryrefslogtreecommitdiff
path: root/nuttx/arch/avr/src/avr32
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2010-10-16 03:22:24 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2010-10-16 03:22:24 +0000
commit4be3a16c92e50578956884546c1458c9914e927e (patch)
treeeb51672599361b130552ad70123aab21c8a454a2 /nuttx/arch/avr/src/avr32
parente4edf83f0ac94f4705635e2af4917e2d0e7e2a7d (diff)
downloadpx4-nuttx-4be3a16c92e50578956884546c1458c9914e927e.tar.gz
px4-nuttx-4be3a16c92e50578956884546c1458c9914e927e.tar.bz2
px4-nuttx-4be3a16c92e50578956884546c1458c9914e927e.zip
No up_en/disable_irq's
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3022 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/avr/src/avr32')
-rw-r--r--nuttx/arch/avr/src/avr32/up_doirq.c8
-rw-r--r--nuttx/arch/avr/src/avr32/up_nommuhead.S4
2 files changed, 3 insertions, 9 deletions
diff --git a/nuttx/arch/avr/src/avr32/up_doirq.c b/nuttx/arch/avr/src/avr32/up_doirq.c
index da3f244d6..abc0cf54d 100644
--- a/nuttx/arch/avr/src/avr32/up_doirq.c
+++ b/nuttx/arch/avr/src/avr32/up_doirq.c
@@ -89,10 +89,6 @@ uint32_t *up_doirq(int irq, uint32_t *regs)
DEBUGASSERT(current_regs == NULL);
current_regs = regs;
- /* Mask and acknowledge the interrupt */
-
- up_maskack_irq(irq);
-
/* Deliver the IRQ */
irq_dispatch(irq, regs);
@@ -108,10 +104,6 @@ uint32_t *up_doirq(int irq, uint32_t *regs)
/* Indicate that we are no long in an interrupt handler */
current_regs = NULL;
-
- /* Unmask the last interrupt (global interrupts are still disabled) */
-
- up_enable_irq(irq);
#endif
up_ledoff(LED_INIRQ);
return regs;
diff --git a/nuttx/arch/avr/src/avr32/up_nommuhead.S b/nuttx/arch/avr/src/avr32/up_nommuhead.S
index 9ac92e217..1c747fa40 100644
--- a/nuttx/arch/avr/src/avr32/up_nommuhead.S
+++ b/nuttx/arch/avr/src/avr32/up_nommuhead.S
@@ -134,12 +134,14 @@ __start:
/* Then jump to OS entry (will not return) */
- rjmp os_start
+ lddpc pc, .Los_start
.Lstackbase:
.word _ebss+CONFIG_IDLETHREAD_STACKSIZE-4
.Lvectortab:
.word vectortab
+.Los_start:
+ .word os_start
.size __start, .-__start
/* This global variable is unsigned long g_heapbase and is