Changeset de57e060 in mainline for kernel/arch/ia64/src/interrupt.c

Timestamp:

2006-10-18T20:51:15Z (18 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

80ca47e

Parents:

cd13c2a

Message:

Convert ia64 to the new IRQ and notification scheme.

File:

• kernel/arch/ia64/src/interrupt.c (modified) (7 diffs)

kernel/arch/ia64/src/interrupt.c

@@ -35 +35 @@
 
 #include <arch/interrupt.h>
+#include <interrupt.h>
+#include <ddi/irq.h>
 #include <panic.h>
 #include <print.h>
+#include <symtab.h>
+#include <debug.h>
 #include <console/console.h>
 #include <arch/types.h>
@@ -42 +46 @@
 #include <arch/barrier.h>
 #include <arch/register.h>
-#include <arch/drivers/it.h>
 #include <arch.h>
-#include <symtab.h>
-#include <debug.h>
 #include <syscall/syscall.h>
 #include <print.h>
@@ -52 +53 @@
 #include <ipc/irq.h>
 #include <ipc/ipc.h>
-#include <interrupt.h>
-
+#include <synch/spinlock.h>
 
 #define VECTORS_64_BUNDLE       20
@@ -61 +61 @@
 
 #define BUNDLE_SIZE             16
-
 
 char *vector_names_64_bundle[VECTORS_64_BUNDLE] = {
@@ -198 +197 @@
 }
 
-
 void nop_handler(uint64_t vector, istate_t *istate)
 {
 }
-
 
 /** Handle syscall. */
@@ -229 +226 @@
 void external_interrupt(uint64_t vector, istate_t *istate)
 {
+        irq_t *irq;
         cr_ivr_t ivr;
         
@@ -234 +232 @@
         srlz_d();
 
-        switch(ivr.vector) {
-        case INTERRUPT_TIMER:
-                it_interrupt();
-                break;
-        case INTERRUPT_SPURIOUS:
-                printf("cpu%d: spurious interrupt\n", CPU->id);
-                break;
-        default:
-                panic("\nUnhandled External Interrupt Vector %d\n", ivr.vector);
-                break;
+        irq = irq_dispatch_and_lock(ivr.vector);
+        if (irq) {
+                irq->handler(irq, irq->arg);
+                spinlock_unlock(&irq->lock);
+        } else {
+                switch (ivr.vector) {
+                case INTERRUPT_SPURIOUS:
+#ifdef CONFIG_DEBUG
+                        printf("cpu%d: spurious interrupt\n", CPU->id);
+#endif
+                        break;
+
+                default:
+                        panic("\nUnhandled External Interrupt Vector %d\n", ivr.vector);
+                        break;
+                }
         }
 }
 
-void virtual_interrupt(uint64_t irq, void *param)
-{
-        switch(irq) {
-        case IRQ_KBD:
-                if (kbd_uspace)
-                        ipc_irq_send_notif(irq);
-                break;
-        default:
-                panic("\nUnhandled Virtual Interrupt request %d\n", irq);
-                break;
-        }
-}
-
 /** @}
  */