Changeset cecb0789 in mainline for kernel/genarch/src/kbd/i8042.c

Timestamp:

2009-02-21T17:27:59Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9688513

Parents:

0cb9fa0

Message:

This is the evil commit. In particular, it does:

• introduces more powerful pseudo code for userspace IRQ top-half handlers
• changes the internals of IRQ dispatching
• simplifies the kernel's i8042 driver
• adapts the uspace i8042 driver to make use of the new pseudocode
• breaks all other architectures except ia32
• breaks almost all existing drivers
• breaks switching between uspace and kernel drivers

File:

• kernel/genarch/src/kbd/i8042.c (modified) (3 diffs)

kernel/genarch/src/kbd/i8042.c

@@ -95 +95 @@
 static irq_t i8042_mouse_irq;
 
-void i8042_grab(void)
-{
-        ipl_t ipl = interrupts_disable();
-        
-        spinlock_lock(&i8042_kbd_irq.lock);
-        i8042_kbd_irq.notif_cfg.notify = false;
-        spinlock_unlock(&i8042_kbd_irq.lock);
-        
-        spinlock_lock(&i8042_mouse_irq.lock);
-        i8042_mouse_irq.notif_cfg.notify = false;
-        spinlock_unlock(&i8042_mouse_irq.lock);
-        
-        interrupts_restore(ipl);
-}
-
-void i8042_release(void)
-{
-        ipl_t ipl = interrupts_disable();
-        
-        spinlock_lock(&i8042_kbd_irq.lock);
-        if (i8042_kbd_irq.notif_cfg.answerbox)
-                i8042_kbd_irq.notif_cfg.notify = true;
-        spinlock_unlock(&i8042_kbd_irq.lock);
-        
-        spinlock_lock(&i8042_mouse_irq.lock);
-        if (i8042_mouse_irq.notif_cfg.answerbox)
-                i8042_mouse_irq.notif_cfg.notify = true;
-        spinlock_unlock(&i8042_mouse_irq.lock);
-        
-        interrupts_restore(ipl);
-}
-
 static irq_ownership_t i8042_claim(irq_t *irq)
 {
@@ -139 +107 @@
 static void i8042_irq_handler(irq_t *irq)
 {
-        if (irq->notif_cfg.notify && irq->notif_cfg.answerbox) {
-                /*
-                 * This will hopefully go to the IRQ dispatcher code soon.
-                 */ 
-                ipc_irq_send_notif(irq);
-                return;
-        }
-
         i8042_instance_t *instance = irq->instance;
         i8042_t *dev = instance->i8042;
@@ -214 +174 @@
         sysinfo_set_item_val("mouse.devno", NULL, mouse_devno);
         sysinfo_set_item_val("mouse.inr", NULL, mouse_inr);
-        
-        i8042_grab();
 }