| 43,7 → 43,8 |
|---|
| #include <genarch/drivers/legacy/ia32/io.h> |
| #include <genarch/drivers/ega/ega.h> |
| #include <arch/drivers/vesa.h> |
| #include <genarch/kbd/i8042.h> |
| #include <genarch/drivers/i8042/i8042.h> |
| #include <genarch/kbrd/kbrd.h> |
| #include <arch/drivers/i8254.h> |
| #include <arch/drivers/i8259.h> |
| #include <arch/boot/boot.h> |
| 149,13 → 150,17 |
|---|
| |
| /* hard clock */ |
| i8254_init(); |
| |
| |
| #ifdef CONFIG_FB |
| if (vesa_present()) |
| vesa_init(); |
| else |
| #endif |
| ega_init(EGA_BASE, EGA_VIDEORAM); /* video */ |
| #ifdef CONFIG_EGA |
| ega_init(EGA_BASE, EGA_VIDEORAM); /* video */ |
| #else |
| {} |
| #endif |
| |
| /* Enable debugger */ |
| debugger_init(); |
| 188,11 → 193,20 |
|---|
| |
| void arch_post_smp_init(void) |
| { |
| #ifdef CONFIG_PC_KBD |
| devno_t devno = device_assign_devno(); |
| /* keyboard controller */ |
| (void) i8042_init((i8042_t *) I8042_BASE, devno, IRQ_KBD); |
| |
| |
| /* |
| * 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_KBD); |
| if (kbrdin) { |
| kbrd_init(kbrdin); |
| trap_virtual_enable_irqs(1 << IRQ_KBD); |
| } |
| |
| /* |
| * This is the necessary evil until the userspace driver is entirely |
| * self-sufficient. |
| */ |
| 203,6 → 217,7 |
|---|
| (uintptr_t) I8042_BASE); |
| sysinfo_set_item_val("kbd.address.kernel", NULL, |
| (uintptr_t) I8042_BASE); |
| #endif |
| } |
| |
| void calibrate_delay_loop(void) |
| 238,9 → 253,14 |
|---|
| void arch_grab_console(void) |
| { |
| #ifdef CONFIG_FB |
| vesa_redraw(); |
| if (vesa_present()) |
| vesa_redraw(); |
| else |
| #endif |
| #ifdef CONFIG_EGA |
| ega_redraw(); |
| #else |
| ega_redraw(); |
| {} |
| #endif |
| } |
| |