Changeset ff381a7 in mainline for uspace/srv/hid/input/ctl/kbdev.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/ctl/kbdev.c (modified) (2 diffs)

uspace/srv/hid/input/ctl/kbdev.c

@@ -94 +94 @@
 static int kbdev_ctl_init(kbd_dev_t *kdev)
 {
-        async_sess_t *sess = loc_service_connect(EXCHANGE_SERIALIZE,
-            kdev->svc_id, 0);
+        async_sess_t *sess = loc_service_connect(kdev->svc_id,
+            INTERFACE_DDF, 0);
         if (sess == NULL) {
                 printf("%s: Failed starting session with '%s.'\n", NAME,
@@ -120 +120 @@
         }
         
-        int rc = async_connect_to_me(exch, 0, 0, 0, kbdev_callback_conn, kbdev);
+        port_id_t port;
+        int rc = async_create_callback_port(exch, INTERFACE_KBD_CB, 0, 0,
+            kbdev_callback_conn, kbdev, &port);
+        
         if (rc != EOK) {
                 printf("%s: Failed creating callback connection from '%s'.\n",