Changes in uspace/srv/hw/char/i8042/i8042.c [385a3d6:7e752b2] in mainline

File:

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

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

@@ -46 +46 @@
 #include <stdio.h>
 #include <errno.h>
+#include <inttypes.h>
 
 #include "i8042.h"
@@ -68 +69 @@
 #define i8042_KBD_TRANSLATE     0x40
 
-/* Mouse constants */
-#define MOUSE_OUT_INIT  0xf4
-#define MOUSE_ACK       0xfa
 
 enum {
@@ -148 +146 @@
 
                 snprintf(name, 16, "%s/ps2%c", NAMESPACE, dchar[i]);
-                rc = devmap_device_register(name, &i8042_port[i].dev_handle);
+                rc = devmap_device_register(name, &i8042_port[i].devmap_handle);
                 if (rc != EOK) {
                         devmap_hangup_phone(DEVMAP_DRIVER);
@@ -167 +165 @@
 static int i8042_init(void)
 {
+        if (sysinfo_get_value("i8042.address.physical", &i8042_physical) != EOK)
+                return -1;
+        
+        if (sysinfo_get_value("i8042.address.kernel", &i8042_kernel) != EOK)
+                return -1;
+        
         void *vaddr;
-
-        i8042_physical = sysinfo_value("i8042.address.physical");
-        i8042_kernel = sysinfo_value("i8042.address.kernel");
         if (pio_enable((void *) i8042_physical, sizeof(i8042_t), &vaddr) != 0)
                 return -1;
+        
         i8042 = vaddr;
-
+        
+        sysarg_t inr_a;
+        sysarg_t inr_b;
+        
+        if (sysinfo_get_value("i8042.inr_a", &inr_a) != EOK)
+                return -1;
+        
+        if (sysinfo_get_value("i8042.inr_b", &inr_b) != EOK)
+                return -1;
+        
         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 */
@@ -189 +198 @@
                 (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;
         i8042_kbd.cmds[3].addr = (void *) &((i8042_t *) i8042_kernel)->data;
-        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);
-
+        ipc_register_irq(inr_a, device_assign_devno(), 0, &i8042_kbd);
+        ipc_register_irq(inr_b, device_assign_devno(), 0, &i8042_kbd);
+        printf("%s: registered for interrupts %" PRIun " and %" PRIun "\n",
+            NAME, inr_a, 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;
@@ -211 +220 @@
         ipc_call_t call;
         ipcarg_t method;
-        dev_handle_t dh;
+        devmap_handle_t dh;
         int retval;
         int dev_id, i;
@@ -223 +232 @@
         dev_id = -1;
         for (i = 0; i < MAX_DEVS; i++) {
-                if (i8042_port[i].dev_handle == dh)
+                if (i8042_port[i].devmap_handle == dh)
                         dev_id = i;
         }
@@ -255 +264 @@
                         break;
                 case IPC_FIRST_USER_METHOD:
-                        printf(NAME ": write %d to devid %d\n",
+                        printf(NAME ": write %" PRIun " to devid %d\n",
                             IPC_GET_ARG1(call), dev_id);
                         i8042_port_write(dev_id, IPC_GET_ARG1(call));
@@ -271 +280 @@
 {
         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();
 }