Changes in uspace/srv/hw/char/i8042/i8042.c [15f3c3f:9934f7d] in mainline

File:

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

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

@@ -39 +39 @@
 #include <ddi.h>
 #include <libarch/ddi.h>
-#include <loc.h>
+#include <devmap.h>
 #include <async.h>
 #include <async_obsolete.h>
@@ -135 +135 @@
         printf(NAME ": i8042 PS/2 port driver\n");
 
-        rc = loc_server_register(NAME, i8042_connection);
+        rc = devmap_driver_register(NAME, i8042_connection);
         if (rc < 0) {
-                printf(NAME ": Unable to register server.\n");
+                printf(NAME ": Unable to register driver.\n");
                 return rc;
         }
@@ -148 +148 @@
 
                 snprintf(name, 16, "%s/ps2%c", NAMESPACE, dchar[i]);
-                rc = loc_service_register(name, &i8042_port[i].service_id);
+                rc = devmap_device_register(name, &i8042_port[i].devmap_handle);
                 if (rc != EOK) {
                         printf(NAME ": Unable to register device %s.\n", name);
@@ -221 +221 @@
         ipc_call_t call;
         sysarg_t method;
-        service_id_t dsid;
+        devmap_handle_t dh;
         int retval;
         int dev_id, i;
@@ -228 +228 @@
 
         /* Get the device handle. */
-        dsid = IPC_GET_ARG1(*icall);
+        dh = IPC_GET_ARG1(*icall);
 
         /* Determine which disk device is the client connecting to. */
         dev_id = -1;
         for (i = 0; i < MAX_DEVS; i++) {
-                if (i8042_port[i].service_id == dsid)
+                if (i8042_port[i].devmap_handle == dh)
                         dev_id = i;
         }