WebSVN – HelenOS – Diff – //trunk/kernel/arch/amd64/src/amd64.c

+    }
+}
 void arch_post_smp_init(void)
+{
+#ifdef CONFIG_PC_KBD
     devno_t devno = device_assign_devno();
-        /*
+    /*
-     * Initialize the keyboard module and conect it to stdin. Then
+     * Initialize the i8042 controller. Then initialize the keyboard
-     * initialize the i8042 controller and connect it to kbrdin. Enable
+     * module and connect it to i8042. Enable keyboard interrupts.
+     */
-     * keyboard interrupts.
+    indev_t *kbrdin = i8042_init((i8042_t *) I8042_BASE, devno, IRQ_KBD);
-         */
+    if (kbrdin) {
-    kbrd_init(stdin);
+        kbrd_init(kbrdin);
-    (void) i8042_init((i8042_t *) I8042_BASE, devno, IRQ_KBD, &kbrdin);
-    trap_virtual_enable_irqs(1 << IRQ_KBD);
+        trap_virtual_enable_irqs(1 << IRQ_KBD);
+    }
     /*
      * This is the necessary evil until the userspace driver is entirely
      * self-sufficient.
      */
     sysinfo_set_item_val("kbd", NULL, true);
     sysinfo_set_item_val("kbd.inr", NULL, IRQ_KBD);
     sysinfo_set_item_val("kbd.address.physical", NULL,
         (uintptr_t) I8042_BASE);
     sysinfo_set_item_val("kbd.address.kernel", NULL,
         (uintptr_t) I8042_BASE);
+#endif
+}
 void calibrate_delay_loop(void)
+{
     i8254_calibrate_delay_loop();
+ *
  */
 void arch_grab_console(void)
+{
 #ifdef CONFIG_FB
+    if (vesa_present())
-    vesa_redraw();
+        vesa_redraw();
+    else
+#endif
+#ifdef CONFIG_EGA
+        ega_redraw();
 #else
-    ega_redraw();
+        {}
 #endif
+}
 /** Return console to userspace
+ *

Subversion Repositories HelenOS

(root)//trunk/kernel/arch/amd64/src/amd64.c – Rev 4057 → 4102