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

Timestamp:

2015-11-02T20:54:19Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d8513177

Parents:

3feeab2 (diff), 5265eea4 (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

@@ -84 +84 @@
                 return rc;
         
-        dev_sess = loc_service_connect(EXCHANGE_ATOMIC, service_id, 0);
+        dev_sess = loc_service_connect(service_id, INTERFACE_DDF, 0);
         if (dev_sess == NULL) {
                 printf("%s: Failed to connect to device\n", NAME);
@@ -98 +98 @@
         
         /* NB: The callback connection is slotted for removal */
-        rc = async_connect_to_me(exch, 0, 0, 0, mouse_port_events, NULL);
+        port_id_t port;
+        rc = async_create_callback_port(exch, INTERFACE_ADB_CB, 0, 0,
+            mouse_port_events, NULL, &port);
+        
         async_exchange_end(exch);
         if (rc != EOK) {