Changes in uspace/srv/hw/char/i8042/i8042.c [ffa2c8ef:d9fae235] in mainline

File:

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

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

@@ -40 +40 @@
 #include <libarch/ddi.h>
 #include <devmap.h>
+#include <ipc/ipc.h>
 #include <async.h>
 #include <unistd.h>
@@ -45 +46 @@
 #include <stdio.h>
 #include <errno.h>
-#include <inttypes.h>
 
 #include "i8042.h"
@@ -145 +145 @@
 
                 snprintf(name, 16, "%s/ps2%c", NAMESPACE, dchar[i]);
-                rc = devmap_device_register(name, &i8042_port[i].devmap_handle);
+                rc = devmap_device_register(name, &i8042_port[i].dev_handle);
                 if (rc != EOK) {
+                        devmap_hangup_phone(DEVMAP_DRIVER);
                         printf(NAME ": Unable to register device %s.\n", name);
                         return rc;
@@ -198 +199 @@
         i8042_kbd.cmds[0].addr = (void *) &((i8042_t *) i8042_kernel)->status;
         i8042_kbd.cmds[3].addr = (void *) &((i8042_t *) i8042_kernel)->data;
-        register_irq(inr_a, device_assign_devno(), 0, &i8042_kbd);
-        register_irq(inr_b, device_assign_devno(), 0, &i8042_kbd);
-        printf("%s: registered for interrupts %" PRIun " and %" PRIun "\n",
-            NAME, inr_a, inr_b);
+        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 %d and %d\n", NAME, inr_a, inr_b);
 
         wait_ready();
@@ -217 +217 @@
         ipc_callid_t callid;
         ipc_call_t call;
-        sysarg_t method;
-        devmap_handle_t dh;
+        ipcarg_t method;
+        dev_handle_t dh;
         int retval;
         int dev_id, i;
@@ -230 +230 @@
         dev_id = -1;
         for (i = 0; i < MAX_DEVS; i++) {
-                if (i8042_port[i].devmap_handle == dh)
+                if (i8042_port[i].dev_handle == dh)
                         dev_id = i;
         }
 
         if (dev_id < 0) {
-                async_answer_0(iid, EINVAL);
+                ipc_answer_0(iid, EINVAL);
                 return;
         }
 
         /* Answer the IPC_M_CONNECT_ME_TO call. */
-        async_answer_0(iid, EOK);
+        ipc_answer_0(iid, EOK);
 
         printf(NAME ": accepted connection\n");
@@ -246 +246 @@
         while (1) {
                 callid = async_get_call(&call);
-                method = IPC_GET_IMETHOD(call);
+                method = IPC_GET_METHOD(call);
                 switch (method) {
                 case IPC_M_PHONE_HUNGUP:
                         /* The other side has hung up. */
-                        async_answer_0(callid, EOK);
+                        ipc_answer_0(callid, EOK);
                         return;
                 case IPC_M_CONNECT_TO_ME:
@@ -262 +262 @@
                         break;
                 case IPC_FIRST_USER_METHOD:
-                        printf(NAME ": write %" PRIun " to devid %d\n",
+                        printf(NAME ": write %d to devid %d\n",
                             IPC_GET_ARG1(call), dev_id);
                         i8042_port_write(dev_id, IPC_GET_ARG1(call));
@@ -271 +271 @@
                         break;
                 }
-                async_answer_0(callid, retval);
+                ipc_answer_0(callid, retval);
         }
 }