Changeset ddf1255 in mainline

Timestamp:

2007-05-10T15:05:37Z (18 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

51ec40f

Parents:

b8f11baa

Message:

keep mouse state in i8042_grab, unify keyboard and mouse IRQ handler
(this fixes ticket #12)

Files:

• kernel/genarch/src/kbd/i8042.c (modified) (5 diffs)
• uspace/kbd/arch/ia32/src/kbd.c (modified) (1 diff)

kernel/genarch/src/kbd/i8042.c

@@ -75 +75 @@
 
 #define i8042_BUFFER_FULL_MASK  0x01
-#define i8042_WAIT_MASK         0x02
-#define i8042_MOUSE_DATA        0x20
+#define i8042_WAIT_MASK                 0x02
+#define i8042_MOUSE_DATA                0x20
 
 static void i8042_suspend(chardev_t *);
@@ -91 +91 @@
 static irq_t i8042_mouse_irq;
 
-/** Wait until the controller reads its data. */
-static void i8042_wait(void) {
-        while (i8042_status_read() & i8042_WAIT_MASK) {
-                /* wait */
-        }
-}
-
 void i8042_grab(void)
 {
         ipl_t ipl = interrupts_disable();
         
-        i8042_wait();
-        i8042_command_write(i8042_SET_COMMAND);
-        i8042_wait();
-        i8042_data_write(i8042_COMMAND);
-        i8042_wait();
-
         spinlock_lock(&i8042_kbd_irq.lock);
         i8042_kbd_irq.notif_cfg.notify = false;
@@ -141 +128 @@
 }
 
-static void i8042_kbd_irq_handler(irq_t *irq, void *arg, ...)
+static void i8042_irq_handler(irq_t *irq, void *arg, ...)
 {
         if (irq->notif_cfg.notify && irq->notif_cfg.answerbox)
                 ipc_irq_send_notif(irq);
         else {
-                uint8_t x;
+                uint8_t data;
                 uint8_t status;
                 
                 while (((status = i8042_status_read()) & i8042_BUFFER_FULL_MASK)) {
-                        x = i8042_data_read();
+                        data = i8042_data_read();
                         
                         if ((status & i8042_MOUSE_DATA))
                                 continue;
-                        
-                        if (x & KEY_RELEASE)
-                                key_released(x ^ KEY_RELEASE);
+
+                        if (data & KEY_RELEASE)
+                                key_released(data ^ KEY_RELEASE);
                         else
-                                key_pressed(x);
+                                key_pressed(data);
                 }
         }
-}
-
-static void i8042_mouse_irq_handler(irq_t *irq, void *arg, ...)
-{
-        if (irq->notif_cfg.notify && irq->notif_cfg.answerbox)
-                ipc_irq_send_notif(irq);
 }
 
@@ -179 +160 @@
         i8042_kbd_irq.inr = kbd_inr;
         i8042_kbd_irq.claim = i8042_claim;
-        i8042_kbd_irq.handler = i8042_kbd_irq_handler;
+        i8042_kbd_irq.handler = i8042_irq_handler;
         irq_register(&i8042_kbd_irq);
         
@@ -186 +167 @@
         i8042_mouse_irq.inr = mouse_inr;
         i8042_mouse_irq.claim = i8042_claim;
-        i8042_mouse_irq.handler = i8042_mouse_irq_handler;
+        i8042_mouse_irq.handler = i8042_irq_handler;
         irq_register(&i8042_mouse_irq);
         

uspace/kbd/arch/ia32/src/kbd.c

@@ -105 +105 @@
         while (i8042_status_read() & i8042_OUTPUT_FULL)
                 i8042_data_read();
+        
         /* Initialize mouse */
         i8042_command_write(i8042_CMD_MOUSE);