Changeset b4b534ac in mainline for uspace/drv/bus/usb/vhc/devconn.c

Timestamp:

2016-07-22T08:24:47Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f76d2c2

Parents:

5b18137 (diff), 8351f9a4 (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 from lp:~jan.vesely/helenos/usb

File:

• uspace/drv/bus/usb/vhc/devconn.c (modified) (5 diffs)

uspace/drv/bus/usb/vhc/devconn.c

@@ -51 +51 @@
 static int vhc_virtdev_plug_generic(vhc_data_t *vhc,
     async_sess_t *sess, usbvirt_device_t *virtdev,
-    uintptr_t *handle, bool connect)
+    uintptr_t *handle, bool connect, usb_address_t address)
 {
         vhc_virtdev_t *dev = vhc_virtdev_create();
@@ -60 +60 @@
         dev->dev_sess = sess;
         dev->dev_local = virtdev;
+        dev->address = address;
 
         fibril_mutex_lock(&vhc->guard);
@@ -78 +79 @@
         if (connect) {
                 // FIXME: check status
-                (void) virthub_connect_device(vhc->hub, dev);
+                (void) virthub_connect_device(&vhc->hub, dev);
         }
 
@@ -86 +87 @@
 int vhc_virtdev_plug(vhc_data_t *vhc, async_sess_t *sess, uintptr_t *handle)
 {
-        return vhc_virtdev_plug_generic(vhc, sess, NULL, handle, true);
+        return vhc_virtdev_plug_generic(vhc, sess, NULL, handle, true, 0);
 }
 
 int vhc_virtdev_plug_local(vhc_data_t *vhc, usbvirt_device_t *dev, uintptr_t *handle)
 {
-        return vhc_virtdev_plug_generic(vhc, NULL, dev, handle, true);
+        return vhc_virtdev_plug_generic(vhc, NULL, dev, handle, true, 0);
 }
 
-int vhc_virtdev_plug_hub(vhc_data_t *vhc, usbvirt_device_t *dev, uintptr_t *handle)
+int vhc_virtdev_plug_hub(vhc_data_t *vhc, usbvirt_device_t *dev, uintptr_t *handle, usb_address_t address)
 {
-        return vhc_virtdev_plug_generic(vhc, NULL, dev, handle, false);
+        return vhc_virtdev_plug_generic(vhc, NULL, dev, handle, false, address);
 }
 
@@ -104 +105 @@
 
         // FIXME: check status
-        (void) virthub_disconnect_device(vhc->hub, dev);
+        (void) virthub_disconnect_device(&vhc->hub, dev);
 
         fibril_mutex_lock(&vhc->guard);