| /trunk/kernel/arch/sparc64/src/console.c |
|---|
| 40,13 → 40,6 |
| #include <arch/drivers/sgcn.h> |
| #ifdef CONFIG_Z8530 |
| #include <genarch/kbd/z8530.h> |
| #endif |
| #ifdef CONFIG_NS16550 |
| #include <genarch/kbd/ns16550.h> |
| #endif |
| #include <console/chardev.h> |
| #include <console/console.h> |
| #include <arch/asm.h> |
| 70,8 → 63,6 |
| static void standard_console_init(ofw_tree_node_t *aliases) |
| { |
| #ifdef CONFIG_FB |
| stdin = NULL; |
| ofw_tree_property_t *prop; |
| ofw_tree_node_t *screen; |
| ofw_tree_node_t *keyboard; |
| /trunk/kernel/arch/sparc64/src/sparc64.c |
|---|
| 89,8 → 89,6 |
| * But we only create 128 buckets. |
| */ |
| irq_init(1 << 11, 128); |
| standalone_sparc64_console_init(); |
| } |
| } |
| 104,13 → 102,14 |
| void arch_post_smp_init(void) |
| { |
| static thread_t *t = NULL; |
| if (config.cpu_active == 1) { |
| standalone_sparc64_console_init(); |
| if (!t) { |
| /* |
| * Create thread that polls keyboard. |
| */ |
| t = thread_create(kkbdpoll, NULL, TASK, 0, "kkbdpoll", true); |
| /* Create thread that polls keyboard. |
| * XXX: this is only used by sgcn now |
| */ |
| thread_t *t = thread_create(kkbdpoll, NULL, TASK, 0, "kkbdpoll", |
| true); |
| if (!t) |
| panic("Cannot create kkbdpoll."); |
| thread_ready(t); |
| /trunk/kernel/arch/sparc64/src/drivers/kbd.c |
|---|
| 34,12 → 34,18 |
| #include <arch/drivers/kbd.h> |
| #include <genarch/ofw/ofw_tree.h> |
| #ifdef CONFIG_SUN_KBD |
| #include <genarch/kbrd/kbrd.h> |
| #endif |
| #ifdef CONFIG_Z8530 |
| #include <genarch/kbd/z8530.h> |
| #include <genarch/drivers/z8530/z8530.h> |
| #endif |
| #ifdef CONFIG_NS16550 |
| #include <genarch/kbd/ns16550.h> |
| #include <genarch/drivers/ns16550/ns16550.h> |
| #endif |
| #include <console/console.h> |
| #include <ddi/device.h> |
| #include <ddi/irq.h> |
| #include <arch/mm/page.h> |
| 159,7 → 165,8 |
| devno = device_assign_devno(); |
| z8530 = (z8530_t *) hw_map(aligned_addr, offset + size) + |
| offset; |
| (void) z8530_init(z8530, devno, inr, cir, cir_arg); |
| kbrd_init(stdin); |
| (void) z8530_init(z8530, devno, inr, cir, cir_arg, &kbrdin); |
| /* |
| * This is the necessary evil until the userspace drivers are |
| 179,7 → 186,8 |
| devno = device_assign_devno(); |
| ns16550 = (ns16550_t *) hw_map(aligned_addr, offset + size) + |
| offset; |
| (void) ns16550_init(ns16550, devno, inr, cir, cir_arg); |
| kbrd_init(stdin); |
| (void) ns16550_init(ns16550, devno, inr, cir, cir_arg, &kbrdin); |
| /* |
| * This is the necessary evil until the userspace driver is |