Changeset 3e828ea in mainline for kernel/arch/mips32/src/mach/msim/msim.c

Timestamp:

2019-09-23T12:49:29Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

9be2358

Parents:

9259d20 (diff), 1a4ec93f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Jiri Svoboda <jiri@…> (2019-09-22 12:49:07)

git-committer:

Jiri Svoboda <jiri@…> (2019-09-23 12:49:29)

Message:

Merge changes from master, especially Meson build

File:

• kernel/arch/mips32/src/mach/msim/msim.c (modified) (2 diffs)

kernel/arch/mips32/src/mach/msim/msim.c

@@ -41 +41 @@
 #include <genarch/drivers/dsrln/dsrlnout.h>
 #include <genarch/srln/srln.h>
+#include <stdbool.h>
 
 static void msim_init(void);
@@ -60 +61 @@
 };
 
+static void msim_irq_handler(unsigned int i)
+{
+        irq_t *irq = irq_dispatch_and_lock(i);
+        if (irq) {
+                irq->handler(irq);
+                irq_spinlock_unlock(&irq->lock, false);
+        } else {
+#ifdef CONFIG_DEBUG
+                log(LF_ARCH, LVL_DEBUG, "cpu%u: spurious IRQ (irq=%u)",
+                    CPU->id, i);
+#endif
+        }
+}
+
 void msim_init(void)
 {
+        irq_init(HW_INTERRUPTS, HW_INTERRUPTS);
+
+        int_handler[INT_HW0] = msim_irq_handler;
+        int_handler[INT_HW1] = msim_irq_handler;
+        int_handler[INT_HW2] = msim_irq_handler;
+        int_handler[INT_HW3] = msim_irq_handler;
+        int_handler[INT_HW4] = msim_irq_handler;
+
         dorder_init();
         cp0_unmask_int(MSIM_DDISK_IRQ);