Changeset f37f811 in mainline for uspace/drv/vhc/hcd.c

Timestamp:

2010-12-15T22:25:01Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

cea3fca

Parents:

ea5dbaf (diff), e63a4e1 (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 usbvirt clean-up branch

File:

• uspace/drv/vhc/hcd.c (modified) (2 diffs)

uspace/drv/vhc/hcd.c

@@ -79 +79 @@
          * Initialize our hub and announce its presence.
          */
-        hub_init(dev);
+        virtual_hub_device_init(dev);
 
         printf("%s: virtual USB host controller ready.\n", NAME);
@@ -95 +95 @@
 };
 
-/** Fibril wrapper for HC transaction manager.
- *
- * @param arg Not used.
- * @return Nothing, return argument is unreachable.
- */
-static int hc_manager_fibril(void *arg)
-{
-        hc_manager();
-        return EOK;
-}
 
 int main(int argc, char * argv[])
 {       
-        printf("%s: virtual USB host controller driver.\n", NAME);
-
-        usb_dprintf_enable(NAME, 0);
-
-        fid_t fid = fibril_create(hc_manager_fibril, NULL);
-        if (fid == 0) {
-                printf("%s: failed to start HC manager fibril\n", NAME);
-                return ENOMEM;
-        }
-        fibril_add_ready(fid);
-
         /*
          * Temporary workaround. Wait a little bit to be the last driver
          * in devman output.
          */
-        sleep(4);
+        sleep(5);
+
+        usb_dprintf_enable(NAME, 0);
+
+        printf(NAME ": virtual USB host controller driver.\n");
+
+        hc_manager();
 
         return driver_main(&vhc_driver);