Changeset e7f2ad68 in mainline for kernel/genarch/src

Timestamp:

2009-02-15T13:57:29Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

ee06f2a

Parents:

826a4e8d

Message:

Get rid of CONFIG_NS16550_INTERRUPT_DRIVEN and CONFIG_I8042_INTERRUPT_DRIVEN.

File:

• kernel/genarch/src/kbd/ns16550.c (modified) (2 diffs)

kernel/genarch/src/kbd/ns16550.c

@@ -139 +139 @@
         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;
@@ -199 +197 @@
 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;