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

Timestamp:

2017-10-17T13:11:35Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

60af4cdb

Parents:

dbf32b1 (diff), a416d070 (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

File:

• uspace/srv/hid/input/port/adb_mouse.c (modified) (1 diff)

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

@@ -75 +75 @@
 static int adb_port_init(mouse_dev_t *mdev)
 {
-        const char *dev = "adb/mouse";
+        const char *dev = "devices/\\hw\\adb\\mouse";
         
         mouse_dev = mdev;
         
         service_id_t service_id;
-        int rc = loc_service_get_id(dev, &service_id, 0);
+        int rc = loc_service_get_id(dev, &service_id, IPC_FLAG_BLOCKING);
         if (rc != EOK)
                 return rc;