Changeset 0e97b4b5 in mainline

Timestamp:

2013-01-04T16:51:11Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

ceb444c

Parents:

237df2f

Message:

vhc: Switch to new roothub initialization.

Remove device address hack.
Fix few bugs in error paths.

Location:

uspace/drv/bus/usb/vhc

Files:

• hub/virthub.c (modified) (1 diff)
• main.c (modified) (3 diffs)

uspace/drv/bus/usb/vhc/hub/virthub.c

@@ -155 +155 @@
         dev->address = 0;
         dev->name = str_dup(name);
-        if (!name)
+        if (!dev->name)
                 return ENOMEM;
 

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

@@ -51 +51 @@
 };
 
-
 static int vhc_control_node(ddf_dev_t *dev, ddf_fun_t **fun)
 {
@@ -93 +92 @@
                 usb_log_error("Failed to init HCD structures: %s.\n",
                    str_error(ret));
-                free(data);
+                ddf_fun_destroy(ctl_fun);
                 return ret;
         }
@@ -100 +99 @@
 
         /* 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, 0);
         if (ret != EOK) {
                 usb_log_error("Failed to plug root hub: %s.\n", str_error(ret));
-                free(data);
+                ddf_fun_destroy(ctl_fun);
                 return ret;
         }
 
-        // TODO fix the address hack
-        ret = hcd_ddf_setup_hub(dev, &address);
+        ret = hcd_ddf_setup_root_hub(dev, USB_SPEED_FULL);
         if (ret != EOK) {
                 usb_log_error("Failed to init VHC root hub: %s\n",