Changeset 7688b5d in mainline for kernel/arch/mips32/src/exception.c

Timestamp:

2006-10-18T09:54:13Z (18 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

6fb30a1

Parents:

19de05f

Message:

mips32: update for new IRQ subsystem

File:

• kernel/arch/mips32/src/exception.c (modified) (3 diffs)

kernel/arch/mips32/src/exception.c

@@ -46 +46 @@
 #include <func.h>
 #include <console/kconsole.h>
+#include <ddi/irq.h>
 #include <arch/debugger.h>
 
@@ -146 +147 @@
         cause = (cp0_cause_read() >> 8) &0xff;
         
-        for (i = 0; i < 8; i++)
-                if (cause & (1 << i))
-                        exc_dispatch(i+INT_OFFSET, istate);
+        for (i = 0; i < 8; i++) {
+                if (cause & (1 << i)) {
+                        irq_t *irq = irq_dispatch_and_lock(i);
+                        if (irq) {
+                                /*
+                                 * The IRQ handler was found.
+                                 */
+                                irq->handler(irq, irq->arg);
+                                spinlock_unlock(&irq->lock);
+                        } else {
+                                /*
+                                 * Spurious interrupt.
+                                 */
+#ifdef CONFIG_DEBUG
+                                printf("cpu%d: spurious interrupt (inum=%d)\n", CPU->id, i);
+#endif
+                        }
+                }
+        }
 }
 
@@ -162 +179 @@
 
         /* Clear exception table */
-        for (i=0;i < IVT_ITEMS; i++)
+        for (i = 0; i < IVT_ITEMS; i++)
                 exc_register(i, "undef", (iroutine) unhandled_exception);
+        
         exc_register(EXC_Bp, "bkpoint", (iroutine) breakpoint_exception);
         exc_register(EXC_RI, "resinstr", (iroutine) reserved_instr_exception);