Changeset 2b96463 in mainline for uspace/srv/hid/kbd/port/chardev.c

Timestamp:

2011-01-28T15:15:11Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

3ee48f2, 7a51d75

Parents:

ef8d655 (diff), ae0300b5 (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/kbd/port/chardev.c (modified) (1 diff)

uspace/srv/hid/kbd/port/chardev.c

@@ -91 +91 @@
 
         /* NB: The callback connection is slotted for removal */
+        sysarg_t taskhash;
         sysarg_t phonehash;
-        if (ipc_connect_to_me(dev_phone, 0, 0, 0, &phonehash) != 0) {
+        if (ipc_connect_to_me(dev_phone, 0, 0, 0, &taskhash, &phonehash) != 0) {
                 printf(NAME ": Failed to create callback from device\n");
                 return -1;
         }
 
-        async_new_connection(phonehash, 0, NULL, kbd_port_events);
+        async_new_connection(taskhash, phonehash, 0, NULL, kbd_port_events);
 
         return 0;