Changeset cea12e9 in mainline for kernel/arch/ia32/src/ia32.c

Timestamp:

2006-10-27T11:13:13Z (18 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

16d71f41

Parents:

8c84448

Message:

ia32: adopt new IRQ interface, mouse not tested yet

File:

• kernel/arch/ia32/src/ia32.c (modified) (5 diffs)

kernel/arch/ia32/src/ia32.c

@@ -58 +58 @@
 #include <arch/mm/memory_init.h>
 #include <interrupt.h>
+#include <ddi/irq.h>
 #include <arch/debugger.h>
 #include <proc/thread.h>
 #include <syscall/syscall.h>
 #include <console/console.h>
+#include <ddi/device.h>
 
 #ifdef CONFIG_SMP
@@ -72 +74 @@
 
         if (config.cpu_active == 1) {
+                interrupt_init();
                 bios_init();
-                i8259_init();   /* PIC */
-                i8254_init();   /* hard clock */
                 
-                exc_register(VECTOR_SYSCALL, "syscall", (iroutine) syscall);
-                
-                #ifdef CONFIG_SMP
-                exc_register(VECTOR_TLB_SHOOTDOWN_IPI, "tlb_shootdown",
-                             (iroutine) tlb_shootdown_ipi);
-                #endif /* CONFIG_SMP */
+                /* PIC */
+                i8259_init();
         }
 }
@@ -88 +85 @@
 {
         if (config.cpu_active == 1) {
+                /* Initialize IRQ routing */
+                irq_init(IRQ_COUNT, IRQ_COUNT);
+                
+                /* hard clock */
+                i8254_init();
 
 #ifdef CONFIG_FB
@@ -95 +97 @@
 #endif
                         ega_init();     /* video */
-                
                 
                 /* Enable debugger */
@@ -127 +128 @@
 void arch_post_smp_init(void)
 {
-        i8042_init();   /* keyboard controller */
+        /* keyboard controller */
+        i8042_init(device_assign_devno(), IRQ_KBD);
 }