| 38,8 → 38,8 |
|---|
| #include <genarch/kbd/key.h> |
| #include <genarch/kbd/scanc.h> |
| #include <genarch/kbd/scanc_sun.h> |
| #include <arch/drivers/kbd.h> |
| #ifndef ia64 |
| #include <arch/drivers/kbd.h> |
| #include <arch/drivers/ns16550.h> |
| #endif |
| #include <ddi/irq.h> |
| 107,11 → 107,14 |
|---|
| |
| /** Initialize ns16550. |
| * |
| * @param devno Device number. |
| * @param inr Interrupt number. |
| * @param vaddr Virtual address of device's registers. |
| * @param devno Device number. |
| * @param port Virtual/IO address of device's registers. |
| * @param inr Interrupt number. |
| * @param cir Clear interrupt function. |
| * @param cir_arg First argument to cir. |
| */ |
| void ns16550_init(devno_t devno, inr_t inr, ioport_t port) |
| void |
| ns16550_init(devno_t devno, ioport_t port, inr_t inr, cir_t cir, void *cir_arg) |
| { |
| chardev_initialize("ns16550_kbd", &kbrd, &ops); |
| stdin = &kbrd; |
| 124,18 → 127,31 |
|---|
| ns16550_irq.inr = inr; |
| ns16550_irq.claim = ns16550_claim; |
| ns16550_irq.handler = ns16550_irq_handler; |
| ns16550_irq.cir = cir; |
| ns16550_irq.cir_arg = cir_arg; |
| irq_register(&ns16550_irq); |
| |
| |
| while ((ns16550_lsr_read(&ns16550) & LSR_DATA_READY)) |
| ns16550_rbr_read(&ns16550); |
| |
| |
| sysinfo_set_item_val("kbd", NULL, true); |
| #ifndef ia64 |
| sysinfo_set_item_val("kbd.type", NULL, KBD_NS16550); |
| #endif |
| sysinfo_set_item_val("kbd.devno", NULL, devno); |
| sysinfo_set_item_val("kbd.inr", NULL, inr); |
| sysinfo_set_item_val("kbd.address.virtual", NULL, port); |
| sysinfo_set_item_val("kbd.port", NULL, port); |
| |
| #ifdef CONFIG_NS16550_INTERRUPT_DRIVEN |
| /* Enable interrupts */ |
| ns16550_ier_write(&ns16550, IER_ERBFI); |
| ns16550_mcr_write(&ns16550, MCR_OUT2); |
| #endif |
| |
| #ifdef ia64 |
| uint8_t c; |
| // This switches rbr & ier to mode when accept baudrate constant |
| c = ns16550_lcr_read(&ns16550); |
| ns16550_lcr_write(&ns16550, 0x80 | c); |
| ns16550_rbr_write(&ns16550, 0x0c); |
| 149,10 → 165,7 |
|---|
| /** Process ns16550 interrupt. */ |
| void ns16550_interrupt(void) |
| { |
| /* TODO |
| * |
| * ns16550 works in the polled mode so far. |
| */ |
| ns16550_poll(); |
| } |
| |
| /* Called from getc(). */ |
| 201,6 → 214,7 |
|---|
| */ |
| void ns16550_poll(void) |
| { |
| #ifndef CONFIG_NS16550_INTERRUPT_DRIVEN |
| ipl_t ipl; |
| |
| ipl = interrupts_disable(); |
| 220,6 → 234,7 |
|---|
| |
| spinlock_unlock(&ns16550_irq.lock); |
| interrupts_restore(ipl); |
| #endif |
| |
| while (ns16550_lsr_read(&ns16550) & LSR_DATA_READY) { |
| uint8_t x; |
| 251,7 → 266,10 |
|---|
| |
| void ns16550_irq_handler(irq_t *irq, void *arg, ...) |
| { |
| panic("Not yet implemented, ns16550 works in polled mode.\n"); |
| if (irq->notif_cfg.notify && irq->notif_cfg.answerbox) |
| ipc_irq_send_notif(irq); |
| else |
| ns16550_interrupt(); |
| } |
| |
| /** @} |