| 62,6 → 62,7 |
|---|
| #include <panic.h> |
| #include <print.h> |
| #include <sysinfo/sysinfo.h> |
| #include <string.h> |
| |
| /* NS16550 as a COM 1 */ |
| #define NS16550_IRQ (4 + LEGACY_INTERRUPT_BASE) |
| 70,6 → 71,7 |
|---|
| |
| static uint64_t iosapic_base = 0xfec00000; |
| |
| /** Performs ia64-specific initialization before main_bsp() is called. */ |
| void arch_pre_main(void) |
| { |
| /* Setup usermode init tasks. */ |
| 83,6 → 85,8 |
|---|
| ((unsigned long) bootinfo->taskmap.tasks[i].addr) | |
| VRN_MASK; |
| init.tasks[i].size = bootinfo->taskmap.tasks[i].size; |
| strncpy(init.tasks[i].name, bootinfo->taskmap.tasks[i].name, |
| CONFIG_TASK_NAME_BUFLEN); |
| } |
| } |
| |
| 167,11 → 171,18 |
|---|
| inr = NS16550_IRQ; |
| (void) ns16550_init((ns16550_t *)NS16550_BASE, devno, inr, NULL, NULL); |
| sysinfo_set_item_val("kbd.type", NULL, KBD_NS16550); |
| sysinfo_set_item_val("kbd.port", NULL, (uintptr_t)NS16550_BASE); |
| 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); |
| sysinfo_set_item_val("kbd.type", NULL, KBD_LEGACY); |
| 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 |
| sysinfo_set_item_val("kbd", NULL, true); |
| sysinfo_set_item_val("kbd.devno", NULL, devno); |