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

Timestamp:

2012-12-22T16:24:28Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

1e2af6a9

Parents:

f6577d9

Message:

vhc: Remove single instance limitation.

Embed hub vitrul device instead of using global instance.

File:

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

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

@@ -44 +44 @@
 #include <usb/debug.h>
 #include "vhcd.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 = {
@@ -57 +50 @@
         .default_handler = default_connection_handler
 };
+
 
 static int vhc_control_node(ddf_dev_t *dev, ddf_fun_t **fun)
@@ -78 +72 @@
                 return ret;
         }
-        vhc_data_init(vhc);
-        // TODO: This limits us to single vhc instance.
-        virthub_init(&virtual_hub_device);
-        vhc->hub = &virtual_hub_device;
+        vhc_init(vhc);
         return EOK;
 }
-
 
 static int vhc_dev_add(ddf_dev_t *dev)
@@ -111 +101 @@
         /* Add virtual hub device */
         usb_address_t address = 1;
-        ret = vhc_virtdev_plug_hub(data, data->hub, NULL, address);
+        ret = vhc_virtdev_plug_hub(data, &data->hub, NULL, address);
         if (ret != EOK) {
                 usb_log_error("Failed to plug root hub: %s.\n", str_error(ret));