Changeset 2b96463 in mainline for uspace/lib/usbvirt/src/main.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/lib/usbvirt/src/main.c (modified) (2 diffs)

uspace/lib/usbvirt/src/main.c

@@ -221 +221 @@
         
         sysarg_t phonehash;
-        rc = ipc_connect_to_me(hcd_phone, 0, 0, 0, &phonehash);
+        sysarg_t taskhash;
+        rc = ipc_connect_to_me(hcd_phone, 0, 0, 0, &taskhash, &phonehash);
         if (rc != EOK) {
                 printf("ipc_connect_to_me() failed\n");
@@ -233 +234 @@
         virtual_device->id = 0;
         
-        async_new_connection(phonehash, 0, NULL, callback_connection);
+        async_new_connection(taskhash, phonehash, 0, NULL, callback_connection);
         
         return EOK;