Changeset 124bc22 in mainline for kernel/arch/mips32/src/exception.c

Timestamp:

2019-04-04T18:08:51Z (5 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5d97627

Parents:

e064102

Message:

Reorganize interrupt and IRQ handling on mips32

This allows msim to use MIPS CPU interrupt numbers as IRQ numbers and
Malta to use ISA IRQ numbers as IRQ numbers. Common code can still
register MIPS CPU interrupts by their respective numbers.

File:

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

kernel/arch/mips32/src/exception.c

@@ -47 +47 @@
 #include <symtab.h>
 #include <log.h>
+#include <arch/machine_func.h>
 
 static const char *exctable[] = {
@@ -174 +175 @@
 
         unsigned int i;
-        for (i = 0; i < 8; i++) {
+        for (i = 0; i < INTERRUPTS; i++) {
 
                 /*
@@ -183 +184 @@
                  */
                 if (im & ip & (1 << i)) {
-                        irq_t *irq = irq_dispatch_and_lock(i);
-                        if (irq) {
-                                /*
-                                 * The IRQ handler was found.
-                                 */
-                                irq->handler(irq);
-                                if (irq->cir)
-                                        irq->cir(irq->cir_arg, i);
-                                irq_spinlock_unlock(&irq->lock, false);
-                        } else {
+                        if (int_handler[i])
+                                int_handler[i](i);
+                        else {
                                 /*
                                  * Spurious interrupt.