Changeset 903bac0a in mainline for uspace/srv/hid/input/port/chardev.c

Timestamp:

2011-08-19T09:00:38Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e2ab36f1

Parents:

d894fbd (diff), 42a619b (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/chardev.c (modified) (4 diffs)

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

@@ -40 +40 @@
 #include <kbd_port.h>
 #include <kbd.h>
-#include <devmap.h>
+#include <loc.h>
 #include <errno.h>
 #include <stdio.h>
@@ -71 +71 @@
 static int chardev_port_init(kbd_dev_t *kdev)
 {
-        devmap_handle_t handle;
+        service_id_t service_id;
         async_exch_t *exch;
         unsigned int i;
@@ -79 +79 @@
         
         for (i = 0; i < num_devs; i++) {
-                rc = devmap_device_get_handle(in_devs[i], &handle, 0);
+                rc = loc_service_get_id(in_devs[i], &service_id, 0);
                 if (rc == EOK)
                         break;
@@ -89 +89 @@
         }
         
-        dev_sess = devmap_device_connect(EXCHANGE_ATOMIC, handle,
+        dev_sess = loc_service_connect(EXCHANGE_ATOMIC, service_id,
             IPC_FLAG_BLOCKING);
         if (dev_sess == NULL) {