Changeset 8607db8 in mainline for kernel/arch/amd64/src/amd64.c

Timestamp:

2006-10-27T13:34:20Z (18 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

ec04b20

Parents:

16d71f41

Message:

amd64: adopt new IRQ interface

File:

• kernel/arch/amd64/src/amd64.c (modified) (6 diffs)

kernel/arch/amd64/src/amd64.c

@@ -62 +62 @@
 #include <syscall/syscall.h>
 #include <console/console.h>
+#include <ddi/irq.h>
+#include <ddi/device.h>
 
 
@@ -131 +133 @@
 
         if (config.cpu_active == 1) {
+                interrupt_init();
                 bios_init();
-                i8259_init();   /* PIC */
-                i8254_init();   /* hard clock */
-
-                #ifdef CONFIG_SMP
-                exc_register(VECTOR_TLB_SHOOTDOWN_IPI, "tlb_shootdown",
-                             tlb_shootdown_ipi);
-                #endif /* CONFIG_SMP */
+                
+                /* PIC */
+                i8259_init();
         }
 }
@@ -145 +144 @@
 {
         if (config.cpu_active == 1) {
+                /* Initialize IRQ routing */
+                irq_init(IRQ_COUNT, IRQ_COUNT);
+                
+                /* hard clock */
+                i8254_init();
+
 #ifdef CONFIG_FB
                 if (vesa_present()) 
@@ -151 +156 @@
 #endif
                         ega_init();     /* video */
+                
                 /* Enable debugger */
                 debugger_init();
@@ -184 +190 @@
 void arch_post_smp_init(void)
 {
-        i8042_init();   /* keyboard controller */
+        /* keyboard controller */
+        i8042_init(device_assign_devno(), IRQ_KBD, device_assign_devno(), IRQ_MOUSE);
 }
 
@@ -190 +197 @@
 {
         i8254_calibrate_delay_loop();
-        i8254_normal_operation();
+        if (config.cpu_active == 1) {
+                /*
+                 * This has to be done only on UP.
+                 * On SMP, i8254 is not used for time keeping and its interrupt pin remains masked.
+                 */
+                i8254_normal_operation();
+        }
 }