Changeset 1462d35 in mainline

Timestamp:

2009-03-12T18:02:51Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

32ddab4e

Parents:

4df7d3a

Message:

update for the new scheme of wiring device drivers to keyboard/serial modules

Location:

kernel/arch

Files:

• ia64/src/ia64.c (modified) (3 diffs)
• sparc64/src/drivers/kbd.c (modified) (3 diffs)

kernel/arch/ia64/src/ia64.c

@@ -153 +153 @@
         srln_init(stdin);
         ski_console_init(&srlnin);
-#endif          
-
+#endif
+        
 #ifdef I460GX
 #ifdef CONFIG_EGA
         ega_init(EGA_BASE, EGA_VIDEORAM);
 #endif
-
+        
         devno_t devno = device_assign_devno();
         inr_t inr;
-
+        
 #ifdef CONFIG_NS16550
         inr = NS16550_IRQ;
-        srln_init(stdin);
-        (void) ns16550_init((ns16550_t *)NS16550_BASE, devno, inr, NULL, NULL,
-            &srlnin);
+        
+        indev_t *kbrdin = ns16550_init(ns16550_t *) NS16550_BASE, devno, inr, NULL, NULL);
+        if (kbrdin)
+                srln_init(kbrdin);
+        
         sysinfo_set_item_val("kbd.type", NULL, KBD_NS16550);
         sysinfo_set_item_val("kbd.address.physical", NULL,
@@ -175 +177 @@
 #else
         inr = IRQ_KBD;
-        kbrd_init(stdin);
-        (void) i8042_init((i8042_t *)I8042_BASE, devno, inr, &kbrdin);
-        trap_virtual_enable_irqs(1 << inr);
+        /*
+         * Initialize the i8042 controller. Then initialize the keyboard
+         * module and connect it to i8042. Enable keyboard interrupts.
+         */
+        indev_t *kbrdin = i8042_init((i8042_t *) I8042_BASE, devno, irq);
+        if (kbrdin) {
+                kbrd_init(kbrdin);
+                trap_virtual_enable_irqs(1 << inr);
+        }
+        
         sysinfo_set_item_val("kbd.type", NULL, KBD_LEGACY);
         sysinfo_set_item_val("kbd.address.physical", NULL,
@@ -188 +197 @@
         sysinfo_set_item_val("kbd.inr", NULL, inr);
 #endif
-
+        
         sysinfo_set_item_val("ia64_iospace", NULL, true);
         sysinfo_set_item_val("ia64_iospace.address", NULL, true);

kernel/arch/sparc64/src/drivers/kbd.c

@@ -27 +27 @@
  */
 
-/** @addtogroup sparc64 
+/** @addtogroup sparc64
  * @{
  */
@@ -168 +168 @@
                 z8530 = (z8530_t *) hw_map(aligned_addr, offset + size) +
                     offset;
-                kbrd_init(stdin);
-                (void) z8530_init(z8530, devno, inr, cir, cir_arg, &kbrdin);
+                
+                indev_t *kbrdin = z8530_init(z8530, devno, inr, cir, cir_arg);
+                if (kbrdin)
+                        kbrd_init(kbrdin);
                 
                 /*
@@ -189 +191 @@
                 ns16550 = (ns16550_t *) hw_map(aligned_addr, offset + size) +
                     offset;
-                kbrd_init(stdin);
-                (void) ns16550_init(ns16550, devno, inr, cir, cir_arg, &kbrdin);
+                
+                indev_t *kbrdin = ns16550_init(ns16550, devno, inr, cir, cir_arg);
+                if (kbrdin)
+                        kbrd_init(kbrdin);
                 
                 /*