summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--c/src/lib/libbsp/arm/vegaplus/ChangeLog4
-rw-r--r--c/src/lib/libbsp/arm/vegaplus/irq/bsp_irq_asm.S7
2 files changed, 8 insertions, 3 deletions
diff --git a/c/src/lib/libbsp/arm/vegaplus/ChangeLog b/c/src/lib/libbsp/arm/vegaplus/ChangeLog
index f3a4abd611..6bb1e1c335 100644
--- a/c/src/lib/libbsp/arm/vegaplus/ChangeLog
+++ b/c/src/lib/libbsp/arm/vegaplus/ChangeLog
@@ -1,3 +1,7 @@
+2002-07-17 Jay Monkman <jtm@smoothsmoothie.com>
+
+ * irq_bsp_irq_asm.S: Update to reflect irq_asm modifications.
+
2002-07-04 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* wrapup/Makefile.am: Eliminate TMPINSTALL_FILES.
diff --git a/c/src/lib/libbsp/arm/vegaplus/irq/bsp_irq_asm.S b/c/src/lib/libbsp/arm/vegaplus/irq/bsp_irq_asm.S
index 7436c3d8fe..764cee3311 100644
--- a/c/src/lib/libbsp/arm/vegaplus/irq/bsp_irq_asm.S
+++ b/c/src/lib/libbsp/arm/vegaplus/irq/bsp_irq_asm.S
@@ -51,17 +51,18 @@ IRQ_return:
orr r0, r0, #0xc3
msr cpsr, r0
- b ReturnFromHandler /* return to ISR handler */
+ mov pc, lr
/*
* Function to acknowledge the IT controller
*/
.globl AckControler
-
+
+#if 0
AckControler:
ldr r0, =INTEOI3
mov r1, #EOI
str r1, [r0]
b ReturnFromAck /* return to ISR handler */
-
+#endif