Changeset e7f2ad68 in mainline

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.

Files:

• HelenOS.config (modified) (1 diff)
• kernel/arch/ia64/src/ia64.c (modified) (2 diffs)
• kernel/arch/sparc64/src/console.c (modified) (1 diff)
• kernel/arch/sparc64/src/sparc64.c (modified) (1 diff)
• kernel/genarch/src/kbd/ns16550.c (modified) (2 diffs)

HelenOS.config

@@ -305 +305 @@
 ! [PLATFORM=ia64&MACHINE!=ski] CONFIG_NS16550 (n/y)
 
+% Support for Serengeti console
+! [PLATFORM=sparc64] CONFIG_SGCN (y/n)
+
 % IOSapic on default address support
 ! [PLATFORM=ia64&MACHINE!=ski] CONFIG_IOSAPIC (y/n)
-
-% Interrupt-driven driver for Legacy Keyboard
-! [CONFIG_NS16550=n&CONFIG_IOSAPIC=y&MACHINE!=ski] CONFIG_I8042_INTERRUPT_DRIVEN (y/n)
-
-% Interrupt-driven driver for NS16550
-! [CONFIG_NS16550=y&((PLATFORM!=ia64)|CONFIG_IOSAPIC=y)&MACHINE!=ski] CONFIG_NS16550_INTERRUPT_DRIVEN (y/n)
-
-% Support for Serengeti console
-! [PLATFORM=sparc64] CONFIG_SGCN (y/n)
 
 % Virtually indexed D-cache support

kernel/arch/ia64/src/ia64.c

@@ -149 +149 @@
 }
 
-
-#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.");
@@ -193 +170 @@
         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
 

kernel/arch/sparc64/src/console.c

@@ -142 +142 @@
         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)

kernel/arch/sparc64/src/sparc64.c

@@ -104 +104 @@
         static thread_t *t = NULL;
 
-
         if (!t) {
                 /*

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;