Changeset 81c0854f in mainline for uspace/drv/vhc/hub/virthub.c

Timestamp:

2011-01-28T12:41:33Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

ba5ab09

Parents:

c2020f7 (diff), ea6a824 (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 usb/development

File:

• uspace/drv/vhc/hub/virthub.c (modified) (3 diffs)

uspace/drv/vhc/hub/virthub.c

@@ -27 +27 @@
  */
 
-/** @addtogroup usb
+/** @addtogroup drvusbvhc
  * @{
  */
@@ -164 +164 @@
         dev->device_data = hub;
 
-        usbvirt_connect_local(dev);
-
-        return EOK;
+        int rc;
+#ifdef STANDALONE_HUB
+        dev->name = "hub";
+        rc = usbvirt_connect(dev);
+#else
+        rc = usbvirt_connect_local(dev);
+#endif
+
+        return rc;
 }
 
@@ -203 +209 @@
 
         hub_acquire(hub);
-        /* TODO: implement. */
+        hub_disconnect_device(hub, conn);
         hub_release(hub);