Changeset 17aca1c in mainline for uspace/lib/usbvirt/src/main.c

Timestamp:

2011-02-04T20:56:52Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

0397e5a4, e29e09cf

Parents:

e778543 (diff), 0b37882 (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) (4 diffs)

uspace/lib/usbvirt/src/main.c

@@ -159 +159 @@
 {
         if (dev->vhcd_phone > 0) {
-                ipc_hangup(dev->vhcd_phone);
+                async_hangup(dev->vhcd_phone);
         }
         
@@ -173 +173 @@
         virtual_device_t *dev = find_device_by_id(0);
         if (dev == NULL) {
-                ipc_answer_0(iid, EINVAL);
+                async_answer_0(iid, EINVAL);
                 printf("Ooops\n");
                 return;
@@ -220 +220 @@
         }
         
-        sysarg_t phonehash;
-        sysarg_t taskhash;
-        rc = ipc_connect_to_me(hcd_phone, 0, 0, 0, &taskhash, &phonehash);
+        rc = async_connect_to_me(hcd_phone, 0, 0, 0, callback_connection);
         if (rc != EOK) {
                 printf("ipc_connect_to_me() failed\n");
@@ -233 +231 @@
         virtual_device->vhcd_phone = hcd_phone;
         virtual_device->id = 0;
-        
-        async_new_connection(taskhash, phonehash, 0, NULL, callback_connection);
         
         return EOK;