| 54,8 → 54,11 |
|---|
| #include <arch/bootinfo.h> |
| #include <genarch/drivers/legacy/ia32/io.h> |
| #include <genarch/drivers/ega/ega.h> |
| #include <genarch/kbd/i8042.h> |
| #include <genarch/kbd/ns16550.h> |
| #include <genarch/kbrd/kbrd.h> |
| #include <genarch/srln/srln.h> |
| #include <genarch/drivers/i8042/i8042.h> |
| #include <genarch/drivers/ns16550/ns16550.h> |
| #include <arch/drivers/kbd.h> |
| #include <smp/smp.h> |
| #include <smp/ipi.h> |
| #include <arch/atomic.h> |
| 65,7 → 68,7 |
|---|
| #include <string.h> |
| |
| /* NS16550 as a COM 1 */ |
| #define NS16550_IRQ (4 + LEGACY_INTERRUPT_BASE) |
| #define NS16550_IRQ (4 + LEGACY_INTERRUPT_BASE) |
| |
| bootinfo_t *bootinfo; |
| |
| 127,20 → 130,13 |
|---|
| |
| } |
| |
| |
| void arch_post_mm_init(void) |
| { |
| if (config.cpu_active == 1) { |
| iosapic_init(); |
| irq_init(INR_COUNT, INR_COUNT); |
| #ifdef SKI |
| ski_init_console(); |
| #else |
| ega_init(EGA_BASE, EGA_VIDEORAM); |
| #endif |
| } |
| it_init(); |
| |
| it_init(); |
| } |
| |
| void arch_post_cpu_init(void) |
| 153,31 → 149,44 |
|---|
| |
| void arch_post_smp_init(void) |
| { |
| /* |
| * Create thread that polls keyboard. |
| */ |
| #ifdef SKI |
| thread_t *t = thread_create(kkbdpoll, NULL, TASK, 0, "kkbdpoll", true); |
| if (!t) |
| panic("Cannot create kkbdpoll."); |
| thread_ready(t); |
| #endif |
| |
| #ifdef I460GX |
| devno_t devno = device_assign_devno(); |
| inr_t inr; |
| |
| indev_t *in; |
| in = skiin_init(); |
| if (in) |
| srln_init(in); |
| skiout_init(); |
| #endif |
| |
| #ifdef CONFIG_EGA |
| ega_init(EGA_BASE, EGA_VIDEORAM); |
| #endif |
| |
| #ifdef CONFIG_NS16550 |
| inr = NS16550_IRQ; |
| (void) ns16550_init((ns16550_t *)NS16550_BASE, devno, inr, NULL, NULL); |
| devno_t devno_ns16550 = device_assign_devno(); |
| indev_t *kbrdin_ns16550 |
| = ns16550_init((ns16550_t *) NS16550_BASE, devno_ns16550, NS16550_IRQ, NULL, NULL); |
| if (kbrdin_ns16550) |
| srln_init(kbrdin_ns16550); |
| |
| sysinfo_set_item_val("kbd", NULL, true); |
| sysinfo_set_item_val("kbd.devno", NULL, devno_ns16550); |
| sysinfo_set_item_val("kbd.inr", NULL, NS16550_IRQ); |
| sysinfo_set_item_val("kbd.type", NULL, KBD_NS16550); |
| sysinfo_set_item_val("kbd.address.physical", NULL, |
| (uintptr_t) NS16550_BASE); |
| sysinfo_set_item_val("kbd.address.kernel", NULL, |
| (uintptr_t) NS16550_BASE); |
| #else |
| inr = IRQ_KBD; |
| (void) i8042_init((i8042_t *)I8042_BASE, devno, inr); |
| #endif |
| |
| #ifdef CONFIG_I8042 |
| devno_t devno_i8042 = device_assign_devno(); |
| indev_t *kbrdin_i8042 = i8042_init((i8042_t *) I8042_BASE, devno_i8042, IRQ_KBD); |
| if (kbrdin_i8042) |
| kbrd_init(kbrdin_i8042); |
| |
| sysinfo_set_item_val("kbd", NULL, true); |
| sysinfo_set_item_val("kbd.devno", NULL, devno_i8042); |
| sysinfo_set_item_val("kbd.inr", NULL, IRQ_KBD); |
| sysinfo_set_item_val("kbd.type", NULL, KBD_LEGACY); |
| sysinfo_set_item_val("kbd.address.physical", NULL, |
| (uintptr_t) I8042_BASE); |
| 184,11 → 193,7 |
|---|
| sysinfo_set_item_val("kbd.address.kernel", NULL, |
| (uintptr_t) I8042_BASE); |
| #endif |
| sysinfo_set_item_val("kbd", NULL, true); |
| sysinfo_set_item_val("kbd.devno", NULL, devno); |
| 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); |
| sysinfo_set_item_val("ia64_iospace.address.virtual", NULL, IO_OFFSET); |