Changeset e2b73d4f in mainline for uspace/srv/hw/char/i8042/i8042.c

Timestamp:

2010-03-21T09:25:29Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

19f857a

Parents:

facebd56 (diff), 4e9aaf5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• uspace/srv/hw/char/i8042/i8042.c (modified) (4 diffs)

uspace/srv/hw/char/i8042/i8042.c

@@ -68 +68 @@
 #define i8042_KBD_TRANSLATE     0x40
 
-/* Mouse constants */
-#define MOUSE_OUT_INIT  0xf4
-#define MOUSE_ACK       0xfa
 
 enum {
@@ -177 +174 @@
         async_set_interrupt_received(i8042_irq_handler);
 
-        /* Disable kbd, enable mouse */
+        /* Disable kbd and aux */
+        wait_ready();
         pio_write_8(&i8042->status, i8042_CMD_WRITE_CMDB);
         wait_ready();
-        pio_write_8(&i8042->status, i8042_CMD_WRITE_CMDB);
-        wait_ready();
-        pio_write_8(&i8042->data, i8042_KBD_DISABLE);
-        wait_ready();
+        pio_write_8(&i8042->data, i8042_KBD_DISABLE | i8042_AUX_DISABLE);
 
         /* Flush all current IO */
         while (pio_read_8(&i8042->status) & i8042_OUTPUT_FULL)
                 (void) pio_read_8(&i8042->data);
-
-        i8042_port_write(DEVID_AUX, MOUSE_OUT_INIT);
 
         i8042_kbd.cmds[0].addr = (void *) &((i8042_t *) i8042_kernel)->status;
@@ -195 +188 @@
         ipc_register_irq(sysinfo_value("i8042.inr_a"), device_assign_devno(), 0, &i8042_kbd);
         ipc_register_irq(sysinfo_value("i8042.inr_b"), device_assign_devno(), 0, &i8042_kbd);
-
+        printf("i8042: registered for interrupts %d and %d\n",
+            sysinfo_value("i8042.inr_a"), sysinfo_value("i8042.inr_b"));
+
+        wait_ready();
         pio_write_8(&i8042->status, i8042_CMD_WRITE_CMDB);
         wait_ready();
         pio_write_8(&i8042->data, i8042_KBD_IE | i8042_KBD_TRANSLATE |
             i8042_AUX_IE);
-        wait_ready();
 
         return 0;
@@ -271 +266 @@
 {
         if (devid == DEVID_AUX) {
+                wait_ready();
                 pio_write_8(&i8042->status, i8042_CMD_WRITE_AUX);
-                wait_ready();
-        }
+        }
+        wait_ready();
         pio_write_8(&i8042->data, data);
-        wait_ready();
 }