Changeset 0b749a3 in mainline for uspace/drv/vhc/hcd.c

Timestamp:

2010-11-22T15:39:53Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

0eddb76, aae339e9

Parents:

9a1d8ab (diff), 8cd1aa5e (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 development/ changes

File:

• uspace/drv/vhc/hcd.c (moved) (moved from uspace/srv/net/netstart/netstart.c ) (2 diffs)

uspace/drv/vhc/hcd.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Lukas Mejdrech
+ * Copyright (c) 2010 Vojtech Horky
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup net
+/** @addtogroup usb
  * @{
+ */ 
+/** @file
+ * @brief Virtual host controller driver.
  */
 
-/** @file
- *
- * Start the networking subsystem.
- * Perform networking self-test if executed
- * with the -s argument.
- *
- */
+#include <devmap.h>
+#include <ipc/ipc.h>
+#include <async.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <sysinfo.h>
+#include <stdio.h>
+#include <errno.h>
+#include <str_error.h>
+#include <driver.h>
 
-#define NAME  "netstart"
+#include <usb/usb.h>
+#include "vhcd.h"
+#include "hc.h"
+#include "devices.h"
+#include "hub.h"
+#include "conn.h"
 
-#include <async.h>
-#include <stdio.h>
-#include <task.h>
-#include <str_error.h>
-#include <ipc/ipc.h>
-#include <ipc/services.h>
 
-#include <net_err.h>
-#include <net_modules.h>
-#include <net_net_messages.h>
+static int vhc_count = 0;
+static int vhc_add_device(usb_hc_device_t *dev)
+{
+        /*
+         * Currently, we know how to simulate only single HC.
+         */
+        if (vhc_count > 0) {
+                return ELIMIT;
+        }
 
-#include "self_test.h"
+        vhc_count++;
 
-/** Start a module.
- *
- * @param[in] desc The module description
- * @param[in] path The module absolute path.
- *
- * @returns true on succesful spanwning
- * @returns false on failure
- *
- */
-static bool spawn(const char *desc, const char *path)
-{
-        printf("%s: Spawning %s (%s)\n", NAME, desc, path);
-        
-        const char *argv[2];
-        
-        argv[0] = path;
-        argv[1] = NULL;
-        
-        int err;
-        if (task_spawn(path, argv, &err) == 0) {
-                fprintf(stderr, "%s: Error spawning %s (%s)\n", NAME, path,
-                    str_error(err));
-                return false;
-        }
-        
-        return true;
-}
+        dev->transfer_ops = &vhc_transfer_ops;
+        dev->generic->ops->default_handler = default_connection_handler;
 
-int main(int argc, char *argv[])
-{
-        ERROR_DECLARE;
-        
-        /* Run self-tests */
-        if ((argc > 1) && (str_cmp(argv[1], "-s") == 0))
-                ERROR_PROPAGATE(self_test());
-        
-        if (!spawn("networking service", "/srv/net"))
-                return EINVAL;
-        
-        printf("%s: Initializing networking\n", NAME);
-        
-        int net_phone = connect_to_service(SERVICE_NETWORKING);
-        if (ERROR_OCCURRED(ipc_call_sync_0_0(net_phone, NET_NET_STARTUP))) {
-                fprintf(stderr, "%s: Startup error %d\n", NAME, ERROR_CODE);
-                return ERROR_CODE;
-        }
-        
+        /*
+         * Initialize our hub and announce its presence.
+         */
+        hub_init();
+        usb_hcd_add_root_hub(dev);
+
+        printf("%s: virtual USB host controller ready.\n", NAME);
+
         return EOK;
 }
 
-/** @}
+static usb_hc_driver_t vhc_driver = {
+        .name = NAME,
+        .add_hc = &vhc_add_device
+};
+
+/** 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);
+
+        debug_level = 10;
+
+        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);
+
+        return usb_hcd_main(&vhc_driver);
+}
+
+
+/**
+ * @}
+ */