Changeset e3f7418 in mainline for uspace/drv/bus/usb/usbhub

Timestamp:

2011-10-15T13:06:28Z (15 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

a044f71

Parents:

3958e315 (diff), 065064e6 (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:

USB improvements.

USB unplug part2; Unplug support in all drivers (except for unused usbmouse driver).
Make descriptor paring work on const pointers.
Fixes several crashes and memory leaks.

Location:

uspace/drv/bus/usb/usbhub

Files:

• port.c (modified) (1 diff)
• usbhub.c (modified) (3 diffs)

uspace/drv/bus/usb/usbhub/port.c

@@ -288 +288 @@
         port->attached_device.fun = NULL;
 
-        ret = usb_hc_unregister_device(&hub->connection,
-            port->attached_device.address);
-        if (ret != EOK) {
-                usb_log_warning("Failed to unregister address of the removed "
-                    "device: %s.\n", str_error(ret));
-        }
+        ret = usb_hc_connection_open(&hub->connection);
+        if (ret == EOK) {
+                ret = usb_hc_unregister_device(&hub->connection,
+                    port->attached_device.address);
+                if (ret != EOK) {
+                        usb_log_warning("Failed to unregister address of the "
+                            "removed device: %s.\n", str_error(ret));
+                }
+                ret = usb_hc_connection_close(&hub->connection);
+                if (ret != EOK) {
+                        usb_log_warning("Failed to close hc connection %s.\n",
+                            str_error(ret));
+                }
+
+        } else {
+                usb_log_warning("Failed to open hc connection %s.\n",
+                    str_error(ret));
+        }
+
         port->attached_device.address = -1;
         fibril_mutex_unlock(&port->mutex);

uspace/drv/bus/usb/usbhub/usbhub.c

@@ -117 +117 @@
         ddf_fun_destroy(hub->hub_fun);
 
-        free(hub);
-        usb_dev->driver_data = NULL;
         usb_log_info("USB hub driver, stopped and cleaned.\n");
         return EOK;
@@ -254 +252 @@
 {
         assert(usb_dev);
-        usb_hub_dev_t *hub_dev = malloc(sizeof(usb_hub_dev_t));
+        usb_hub_dev_t *hub_dev =
+            usb_device_data_alloc(usb_dev, sizeof(usb_hub_dev_t));
         if (!hub_dev)
             return NULL;
 
         hub_dev->usb_device = usb_dev;
-
         hub_dev->ports = NULL;
         hub_dev->port_count = 0;
@@ -266 +264 @@
         fibril_mutex_initialize(&hub_dev->pending_ops_mutex);
         fibril_condvar_initialize(&hub_dev->pending_ops_cv);
-        usb_dev->driver_data = hub_dev;
 
         return hub_dev;