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

Timestamp:

2019-09-23T12:49:29Z (6 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/interrupt.c (modified) (5 diffs)

kernel/arch/mips32/src/interrupt.c

@@ -41 +41 @@
 #include <ipc/sysipc.h>
 
-#define IRQ_COUNT   8
-#define TIMER_IRQ   7
-
-function virtual_timer_fnc = NULL;
-static irq_t timer_irq;
-
 // TODO: This is SMP unsafe!!!
 
@@ -52 +46 @@
 static unsigned long nextcount;
 static unsigned long lastcount;
+
+/** Table of interrupt handlers. */
+int_handler_t int_handler[MIPS_INTERRUPTS] = { };
 
 /** Disable interrupts.
@@ -113 +110 @@
 }
 
-static irq_ownership_t timer_claim(irq_t *irq)
-{
-        return IRQ_ACCEPT;
-}
-
-static void timer_irq_handler(irq_t *irq)
+static void timer_interrupt_handler(unsigned int intr)
 {
         if (cp0_count_read() < lastcount)
@@ -135 +127 @@
         cp0_compare_write(nextcount);
 
-        /*
-         * We are holding a lock which prevents preemption.
-         * Release the lock, call clock() and reacquire the lock again.
-         */
-        irq_spinlock_unlock(&irq->lock, false);
         clock();
-        irq_spinlock_lock(&irq->lock, false);
-
-        if (virtual_timer_fnc != NULL)
-                virtual_timer_fnc();
 }
 
@@ -150 +133 @@
 void interrupt_init(void)
 {
-        irq_init(IRQ_COUNT, IRQ_COUNT);
-
-        irq_initialize(&timer_irq);
-        timer_irq.inr = TIMER_IRQ;
-        timer_irq.claim = timer_claim;
-        timer_irq.handler = timer_irq_handler;
-        irq_register(&timer_irq);
+        int_handler[INT_TIMER] = timer_interrupt_handler;
 
         timer_start();
-        cp0_unmask_int(TIMER_IRQ);
+        cp0_unmask_int(INT_TIMER);
 }