| /trunk/kernel/genarch/src/kbd/ns16550.c |
|---|
| 138,11 → 138,9 |
| 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 |
| uint8_t c; |
| // This switches rbr & ier to mode when accept baudrate constant |
| 198,28 → 196,6 |
| */ |
| void ns16550_poll(void) |
| { |
| #ifndef CONFIG_NS16550_INTERRUPT_DRIVEN |
| ipl_t ipl; |
| ipl = interrupts_disable(); |
| spinlock_lock(&ns16550_irq.lock); |
| if (ns16550_lsr_read(&ns16550) & LSR_DATA_READY) { |
| if (ns16550_irq.notif_cfg.notify && ns16550_irq.notif_cfg.answerbox) { |
| /* |
| * Send IPC notification. |
| */ |
| ipc_irq_send_notif(&ns16550_irq); |
| spinlock_unlock(&ns16550_irq.lock); |
| interrupts_restore(ipl); |
| return; |
| } |
| } |
| spinlock_unlock(&ns16550_irq.lock); |
| interrupts_restore(ipl); |
| #endif |
| while (ns16550_lsr_read(&ns16550) & LSR_DATA_READY) { |
| uint8_t x; |
| /trunk/kernel/arch/sparc64/src/console.c |
|---|
| 141,32 → 141,10 |
| { |
| thread_detach(THREAD); |
| #ifdef CONFIG_Z8530 |
| if (kbd_type == KBD_Z8530) { |
| /* |
| * The z8530 driver is interrupt-driven. |
| */ |
| if (kbd_type != KBD_SGCN) |
| return; |
| } |
| #endif |
| #ifdef CONFIG_NS16550 |
| #ifdef CONFIG_NS16550_INTERRUPT_DRIVEN |
| if (kbd_type == KBD_NS16550) { |
| /* |
| * The ns16550 driver is interrupt-driven. |
| */ |
| return; |
| } |
| #endif |
| #endif |
| while (1) { |
| #ifdef CONFIG_NS16550 |
| #ifndef CONFIG_NS16550_INTERRUPT_DRIVEN |
| if (kbd_type == KBD_NS16550) |
| ns16550_poll(); |
| #endif |
| #endif |
| #ifdef CONFIG_SGCN |
| if (kbd_type == KBD_SGCN) |
| sgcn_poll(); |
| /trunk/kernel/arch/sparc64/src/sparc64.c |
|---|
| 103,7 → 103,6 |
| { |
| static thread_t *t = NULL; |
| if (!t) { |
| /* |
| * Create thread that polls keyboard. |
| /trunk/kernel/arch/ia64/src/ia64.c |
|---|
| 148,36 → 148,13 |
| { |
| } |
| #ifdef I460GX |
| #define POLL_INTERVAL 50000 /* 50 ms */ |
| /** Kernel thread for polling keyboard. */ |
| static void i8042_kkbdpoll(void *arg) |
| { |
| while (1) { |
| #ifdef CONFIG_NS16550 |
| #ifndef CONFIG_NS16550_INTERRUPT_DRIVEN |
| ns16550_poll(); |
| #endif |
| #else |
| #ifndef CONFIG_I8042_INTERRUPT_DRIVEN |
| i8042_poll(); |
| #endif |
| #endif |
| thread_usleep(POLL_INTERVAL); |
| } |
| } |
| #endif |
| void arch_post_smp_init(void) |
| { |
| thread_t *t; |
| /* |
| * Create thread that polls keyboard. |
| */ |
| #ifdef SKI |
| t = thread_create(kkbdpoll, NULL, TASK, 0, "kkbdpoll", true); |
| thread_t *t = thread_create(kkbdpoll, NULL, TASK, 0, "kkbdpoll", true); |
| if (!t) |
| panic("Cannot create kkbdpoll."); |
| thread_ready(t); |
| 192,10 → 169,6 |
| devno_t mouse = device_assign_devno(); |
| i8042_init(kbd, IRQ_KBD, mouse, IRQ_MOUSE); |
| #endif |
| t = thread_create(i8042_kkbdpoll, NULL, TASK, 0, "kkbdpoll", true); |
| if (!t) |
| panic("Cannot create kkbdpoll."); |
| thread_ready(t); |
| #endif |
| sysinfo_set_item_val("ia64_iospace", NULL, true); |