| 26,7 → 26,7 |
|---|
| * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| */ |
| |
| /** @addtogroup sparc64 |
| /** @addtogroup sparc64 |
| * @{ |
| */ |
| /** @file |
| 46,7 → 46,6 |
|---|
| #endif |
| |
| #include <console/console.h> |
| #include <ddi/device.h> |
| #include <ddi/irq.h> |
| #include <arch/mm/page.h> |
| #include <arch/types.h> |
| 57,6 → 56,8 |
|---|
| |
| kbd_type_t kbd_type = KBD_UNKNOWN; |
| |
| #ifdef CONFIG_SUN_KBD |
| |
| /** Initialize keyboard. |
| * |
| * Traverse OpenFirmware device tree in order to find necessary |
| 72,7 → 73,7 |
|---|
| const char *name; |
| cir_t cir; |
| void *cir_arg; |
| |
| |
| #ifdef CONFIG_NS16550 |
| ns16550_t *ns16550; |
| #endif |
| 113,7 → 114,6 |
|---|
| |
| uintptr_t pa; |
| size_t size; |
| devno_t devno; |
| inr_t inr; |
| |
| switch (kbd_type) { |
| 162,12 → 162,13 |
|---|
| switch (kbd_type) { |
| #ifdef CONFIG_Z8530 |
| case KBD_Z8530: |
| devno = device_assign_devno(); |
| z8530 = (z8530_t *) hw_map(aligned_addr, offset + size) + |
| offset; |
| kbrd_init(stdin); |
| (void) z8530_init(z8530, devno, inr, cir, cir_arg, &kbrdin); |
| |
| indev_t *kbrdin_z8530 = z8530_init(z8530, inr, cir, cir_arg); |
| if (kbrdin_z8530) |
| kbrd_init(kbrdin_z8530); |
| |
| /* |
| * This is the necessary evil until the userspace drivers are |
| * entirely self-sufficient. |
| 174,7 → 175,6 |
|---|
| */ |
| sysinfo_set_item_val("kbd", NULL, true); |
| sysinfo_set_item_val("kbd.type", NULL, KBD_Z8530); |
| sysinfo_set_item_val("kbd.devno", NULL, devno); |
| sysinfo_set_item_val("kbd.inr", NULL, inr); |
| sysinfo_set_item_val("kbd.address.kernel", NULL, |
| (uintptr_t) z8530); |
| 183,12 → 183,13 |
|---|
| #endif |
| #ifdef CONFIG_NS16550 |
| case KBD_NS16550: |
| devno = device_assign_devno(); |
| ns16550 = (ns16550_t *) hw_map(aligned_addr, offset + size) + |
| offset; |
| kbrd_init(stdin); |
| (void) ns16550_init(ns16550, devno, inr, cir, cir_arg, &kbrdin); |
| |
| indev_t *kbrdin_ns16550 = ns16550_init(ns16550, inr, cir, cir_arg); |
| if (kbrdin_ns16550) |
| kbrd_init(kbrdin_ns16550); |
| |
| /* |
| * This is the necessary evil until the userspace driver is |
| * entirely self-sufficient. |
| 195,7 → 196,6 |
|---|
| */ |
| sysinfo_set_item_val("kbd", NULL, true); |
| sysinfo_set_item_val("kbd.type", NULL, KBD_NS16550); |
| sysinfo_set_item_val("kbd.devno", NULL, devno); |
| sysinfo_set_item_val("kbd.inr", NULL, inr); |
| sysinfo_set_item_val("kbd.address.kernel", NULL, |
| (uintptr_t) ns16550); |
| 208,5 → 208,7 |
|---|
| } |
| } |
| |
| #endif |
| |
| /** @} |
| */ |