Changeset 7943c43 in mainline for uspace/drv/bus/usb/usbhub/port.c

Timestamp:

2012-01-16T22:45:38Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

32817cc, 3fe58d3c

Parents:

9117ef9b (diff), 3ea725e (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 mainline changes.

File:

• uspace/drv/bus/usb/usbhub/port.c (modified) (2 diffs)

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

@@ -288 +288 @@
         port->attached_device.fun = NULL;
 
-        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));
+        ret = usb_hub_unregister_device(&hub->usb_device->hc_conn,
+            &port->attached_device);
+        if (ret != EOK) {
+                usb_log_warning("Failed to unregister address of the "
+                    "removed device: %s.\n", str_error(ret));
         }
 
@@ -438 +426 @@
 
         const int rc = usb_hc_new_device_wrapper(data->hub->usb_device->ddf_dev,
-            &data->hub->connection, data->speed, enable_port_callback,
+            &data->hub->usb_device->hc_conn, data->speed, enable_port_callback,
             data->port, &new_address, NULL, NULL, &child_fun);