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

Timestamp:

2006-10-18T09:54:13Z (19 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/interrupt.c (modified) (4 diffs)

kernel/arch/mips32/src/interrupt.c

@@ -40 +40 @@
 #include <time/clock.h>
 #include <arch/drivers/arc.h>
+#include <ipc/sysipc.h>
+#include <ddi/device.h>
+#include <ddi/irq.h>
 
-#include <ipc/sysipc.h>
+#define IRQ_COUNT 8
+#define TIMER_IRQ 7
+
+function timer_fnc = NULL;
+static irq_t timer_irq;
 
 /** Disable interrupts.
@@ -92 +99 @@
 }
 
-static void timer_exception(int n, istate_t *istate)
+static irq_ownership_t timer_claim(void)
+{
+        return IRQ_ACCEPT;
+}
+
+static void timer_irq_handler(irq_t *irq, void *arg, ...)
 {
         unsigned long drift;
@@ -104 +116 @@
         cp0_compare_write(nextcount);
         clock();
-}
-
-static void swint0(int n, istate_t *istate)
-{
-        cp0_cause_write(cp0_cause_read() & ~(1 << 8)); /* clear SW0 interrupt */
-        ipc_irq_send_notif(0);
-}
-
-static void swint1(int n, istate_t *istate)
-{
-        cp0_cause_write(cp0_cause_read() & ~(1 << 9)); /* clear SW1 interrupt */
-        ipc_irq_send_notif(1);
+        
+        if (timer_fnc != NULL)
+                timer_fnc();
 }
 
@@ -121 +124 @@
 void interrupt_init(void)
 {
-        int_register(TIMER_IRQ, "timer", timer_exception);
-        int_register(0, "swint0", swint0);
-        int_register(1, "swint1", swint1);
+        irq_init(IRQ_COUNT, IRQ_COUNT);
+        
+        irq_initialize(&timer_irq);
+        timer_irq.devno = device_assign_devno();
+        timer_irq.inr = TIMER_IRQ;
+        timer_irq.claim = timer_claim;
+        timer_irq.handler = timer_irq_handler;
+        irq_register(&timer_irq);
+        
         timer_start();
-}
-
-static void ipc_int(int n, istate_t *istate)
-{
-        ipc_irq_send_notif(n-INT_OFFSET);
-}
-
-/* Reregister irq to be IPC-ready */
-void irq_ipc_bind_arch(unative_t irq)
-{
-        /* Do not allow to redefine timer */
-        /* Swint0, Swint1 are already handled */
-        if (irq == TIMER_IRQ || irq < 2)
-                return;
-        int_register(irq, "ipc_int", ipc_int);
+        cp0_unmask_int(TIMER_IRQ);
 }