Changeset 925a21e in mainline for uspace/srv/hid/input/port/adb.c

Timestamp:

2011-09-24T14:20:29Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5bf76c1

Parents:

867e2555 (diff), 1ab4aca (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/hid/input/port/adb.c (modified) (3 diffs)

uspace/srv/hid/input/port/adb.c

@@ -43 +43 @@
 #include <fcntl.h>
 #include <errno.h>
-#include <devmap.h>
+#include <loc.h>
 
 static void kbd_port_events(ipc_callid_t iid, ipc_call_t *icall, void *arg);
@@ -66 +66 @@
 {
         const char *dev = "adb/kbd";
-        devmap_handle_t handle;
+        service_id_t service_id;
         async_exch_t *exch;
         int rc;
@@ -72 +72 @@
         kbd_dev = kdev;
         
-        rc = devmap_device_get_handle(dev, &handle, 0);
+        rc = loc_service_get_id(dev, &service_id, 0);
         if (rc != EOK)
                 return rc;
         
-        dev_sess = devmap_device_connect(EXCHANGE_ATOMIC, handle, 0);
+        dev_sess = loc_service_connect(EXCHANGE_ATOMIC, service_id, 0);
         if (dev_sess == NULL) {
                 printf("%s: Failed to connect to device\n", NAME);