Changeset 89c09ae in mainline

Timestamp:

2010-03-16T21:35:37Z (14 years ago)

Author:

U-GONZALES\root <root@…>

Branches:

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

Children:

7b76744

Parents:

6e81d04

Message:

Improvements to i8042/char_mouse. This fixes ticket #208.

Location:

uspace/srv

Files:

• hid/char_mouse/chardev.c (modified) (1 diff)
• hid/char_mouse/proto/ps2.c (modified) (2 diffs)
• hw/char/i8042/i8042.c (modified) (4 diffs)

uspace/srv/hid/char_mouse/chardev.c

@@ -48 +48 @@
 static int dev_phone;
 
-#define NAME "kbd"
+#define NAME "char_mouse"
 
 int mouse_port_init(void)

uspace/srv/hid/char_mouse/proto/ps2.c

@@ -36 +36 @@
 
 #include <stdio.h>
+#include <mouse_port.h>
+#include <char_mouse.h>
 #include <mouse_proto.h>
-#include <char_mouse.h>
 
 #define BUFSIZE 3
+
+#define PS2_MOUSE_OUT_INIT  0xf4
+#define PS2_MOUSE_ACK       0xfa
 
 typedef struct {
@@ -67 +71 @@
 int mouse_proto_init(void)
 {
+        mouse_port_write(PS2_MOUSE_OUT_INIT);
         return 0;
 }

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();
 }