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

Timestamp:

2011-01-28T10:49:24Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

81c0854f, 89beb08

Parents:

6265a2b (diff), c5c003c (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 standalone virtual hub

File:

• uspace/drv/vhc/hub/virthub.c (modified) (1 diff)

uspace/drv/vhc/hub/virthub.c

@@ -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;
 }