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

Timestamp:

2015-11-02T20:54:19Z (10 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/input.c (modified) (2 diffs)

uspace/srv/hid/input/input.c

@@ -745 +745 @@
         if (irc_service) {
                 while (irc_sess == NULL)
-                        irc_sess = service_connect_blocking(EXCHANGE_SERIALIZE,
-                            SERVICE_IRC, 0, 0);
+                        irc_sess = service_connect_blocking(SERVICE_IRC,
+                            INTERFACE_IRC, 0);
         }
         
@@ -758 +758 @@
         async_set_client_data_constructor(client_data_create);
         async_set_client_data_destructor(client_data_destroy);
-        async_set_client_connection(client_connection);
+        async_set_fallback_port_handler(client_connection, NULL);
         
         int rc = loc_server_register(NAME);