Changeset e63a4e1 in mainline

Timestamp:

2010-12-15T22:02:26Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

f37f811

Parents:

774afaae

Message:

A bit clean main() in VHC

Location:

uspace/drv/vhc

Files:

• hc.c (modified) (2 diffs)
• hcd.c (modified) (2 diffs)

uspace/drv/vhc/hc.c

@@ -102 +102 @@
 /** Host controller manager main function.
  */
-void hc_manager(void)
+static int hc_manager_fibril(void *arg)
 {
         list_initialize(&transaction_list);
@@ -139 +139 @@
                 free(transaction);
         }
+
+        assert(false && "unreachable");
+        return EOK;
+}
+
+void hc_manager(void)
+{
+        fid_t fid = fibril_create(hc_manager_fibril, NULL);
+        if (fid == 0) {
+                printf(NAME ": failed to start HC manager fibril\n");
+                return;
+        }
+        fibril_add_ready(fid);
 }
 

uspace/drv/vhc/hcd.c

@@ -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[])
@@ -112 +102 @@
          * in devman output.
          */
-        sleep(4);
+        sleep(5);
+
+        usb_dprintf_enable(NAME, 0);
 
         printf(NAME ": virtual USB host controller driver.\n");
 
-        usb_dprintf_enable(NAME, 0);
-
-        fid_t fid = fibril_create(hc_manager_fibril, NULL);
-        if (fid == 0) {
-                printf(NAME ": failed to start HC manager fibril\n");
-                return ENOMEM;
-        }
-        fibril_add_ready(fid);
-
+        hc_manager();
 
         return driver_main(&vhc_driver);