Changeset 8ff0bd2 in mainline for uspace/lib/usbvirt/src/device.c

Timestamp:

2011-09-04T11:30:58Z (15 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

03bc76a

Parents:

d2c67e7 (diff), deac215e (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/device.c (modified) (3 diffs)

uspace/lib/usbvirt/src/device.c

@@ -49 +49 @@
 /** Main IPC call handling from virtual host controller.
  *
- * @param iid Caller identification.
- * @param icall Initial incoming call.
+ * @param iid   Caller identification
+ * @param icall Initial incoming call
+ * @param arg   Local argument
  */
-static void callback_connection(ipc_callid_t iid, ipc_call_t *icall)
+static void callback_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
 {
         assert(DEV != NULL);
@@ -86 +87 @@
         
         devman_handle_t handle;
-        int rc = devman_device_get_handle(vhc_path, &handle, 0);
+        int rc = devman_fun_get_handle(vhc_path, &handle, 0);
         if (rc != EOK)
                 return rc;
@@ -99 +100 @@
         
         async_exch_t *exch = async_exchange_begin(hcd_sess);
-        rc = async_connect_to_me(exch, 0, 0, 0, callback_connection);
+        rc = async_connect_to_me(exch, 0, 0, 0, callback_connection, NULL);
         async_exchange_end(exch);