Changeset f6577d9 in mainline for uspace/drv/bus/usb/vhc/main.c

Timestamp:

2012-12-22T15:48:33Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

f5f0cfb

Parents:

01eeaaf

Message:

vhc: DCE

File:

• uspace/drv/bus/usb/vhc/main.c (modified) (4 diffs)

uspace/drv/bus/usb/vhc/main.c

@@ -34 +34 @@
  */
 
-#include <loc.h>
-#include <async.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <sysinfo.h>
 #include <stdio.h>
 #include <errno.h>
@@ -46 +41 @@
 #include <usb/host/ddf_helpers.h>
 
-#include <usb/usb.h>
 #include <usb/ddfiface.h>
-#include <usb_iface.h>
+#include <usb/debug.h>
 #include "vhcd.h"
-#include "hub.h"
-#include "conn.h"
+#include "hub/hub.h"
+#include "hub/virthub.h"
+
+static usbvirt_device_t virtual_hub_device = {
+        .name = "root hub",
+        .ops = &hub_ops,
+        .address = 0
+};
 
 static ddf_dev_ops_t vhc_ops = {
-#if 0
-        .interfaces[USBHC_DEV_IFACE] = &vhc_iface,
-        .interfaces[USB_DEV_IFACE] = &vhc_usb_iface,
-#endif
         .close = on_client_close,
         .default_handler = default_connection_handler
@@ -131 +127 @@
 
         return ret;
-#if 0
-        static int vhc_count = 0;
-        int rc;
-
-        if (vhc_count > 0) {
-                return ELIMIT;
-        }
-
-        vhc_data_t *data = ddf_dev_data_alloc(dev, sizeof(vhc_data_t));
-        if (data == NULL) {
-                usb_log_fatal("Failed to allocate memory.\n");
-                return ENOMEM;
-        }
-        data->magic = 0xDEADBEEF;
-        rc = usb_endpoint_manager_init(&data->ep_manager, (size_t) -1,
-            bandwidth_count_usb11);
-        if (rc != EOK) {
-                usb_log_fatal("Failed to initialize endpoint manager.\n");
-                free(data);
-                return rc;
-        }
-        usb_device_manager_init(&data->dev_manager, USB_SPEED_MAX);
-
-        ddf_fun_t *hc = ddf_fun_create(dev, fun_exposed, "hc");
-        if (hc == NULL) {
-                usb_log_fatal("Failed to create device function.\n");
-                free(data);
-                return ENOMEM;
-        }
-
-        ddf_fun_set_ops(hc, &vhc_ops);
-        list_initialize(&data->devices);
-        fibril_mutex_initialize(&data->guard);
-        data->hub = &virtual_hub_device;
-        data->hc_fun = hc;
-
-        rc = ddf_fun_bind(hc);
-        if (rc != EOK) {
-                usb_log_fatal("Failed to bind HC function: %s.\n",
-                    str_error(rc));
-                free(data);
-                return rc;
-        }
-
-        rc = ddf_fun_add_to_category(hc, USB_HC_CATEGORY);
-        if (rc != EOK) {
-                usb_log_fatal("Failed to add function to HC class: %s.\n",
-                    str_error(rc));
-                free(data);
-                return rc;
-        }
-
-        virtual_hub_device_init(hc);
-
-        usb_log_info("Virtual USB host controller ready (dev %zu, hc %zu).\n",
-            (size_t) ddf_dev_get_handle(dev), (size_t) ddf_fun_get_handle(hc));
-
-        rc = vhc_virtdev_plug_hub(data, data->hub, NULL);
-        if (rc != EOK) {
-                usb_log_fatal("Failed to plug root hub: %s.\n", str_error(rc));
-                free(data);
-                return rc;
-        }
-
-        return EOK;
-#endif
 }
 
@@ -208 +138 @@
 };
 
-
 int main(int argc, char * argv[])
 {
         log_init(NAME);
-
         printf(NAME ": virtual USB host controller driver.\n");