Changeset db6e419 in mainline for uspace/srv/hid/input/port/adb_mouse.c

Timestamp:

2011-08-16T18:53:00Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

49160c4

Parents:

e0e922d (diff), 45058baa (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_mouse.c (modified) (2 diffs)

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

@@ -41 +41 @@
 #include <mouse.h>
 #include <errno.h>
-#include <devmap.h>
+#include <loc.h>
 
 static mouse_dev_t *mouse_dev;
@@ -78 +78 @@
         mouse_dev = mdev;
         
-        devmap_handle_t handle;
-        int rc = devmap_device_get_handle(dev, &handle, 0);
+        service_id_t service_id;
+        int 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);