Changeset 3819ce5 in mainline for uspace/drv/bus/usb/usbhub/usbhub.c

Timestamp:

2011-12-25T10:05:28Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

ecf823a

Parents:

1440eae (diff), 7e1b130 (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 with mainline

File:

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

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

@@ -99 +99 @@
         fibril_condvar_initialize(&hub_dev->pending_ops_cv);
 
-        /* Create hc connection */
-        usb_log_debug("Initializing USB wire abstraction.\n");
-        int opResult = usb_hc_connection_initialize_from_device(
-            &hub_dev->connection, hub_dev->usb_device->ddf_dev);
-        if (opResult != EOK) {
-                usb_log_error("Could not initialize connection to device: %s\n",
+
+        int opResult = usb_pipe_start_long_transfer(&usb_dev->ctrl_pipe);
+        if (opResult != EOK) {
+                usb_log_error("Failed to start long ctrl pipe transfer: %s\n",
                     str_error(opResult));
                 return opResult;
@@ -112 +110 @@
         opResult = usb_set_first_configuration(usb_dev);
         if (opResult != EOK) {
+                usb_pipe_end_long_transfer(&usb_dev->ctrl_pipe);
                 usb_log_error("Could not set hub configuration: %s\n",
                     str_error(opResult));
@@ -120 +119 @@
         opResult = usb_hub_process_hub_specific_info(hub_dev);
         if (opResult != EOK) {
+                usb_pipe_end_long_transfer(&usb_dev->ctrl_pipe);
                 usb_log_error("Could process hub specific info, %s\n",
                     str_error(opResult));
@@ -130 +130 @@
             fun_exposed, HUB_FNC_NAME);
         if (hub_dev->hub_fun == NULL) {
+                usb_pipe_end_long_transfer(&usb_dev->ctrl_pipe);
                 usb_log_error("Failed to create hub function.\n");
                 return ENOMEM;
@@ -137 +138 @@
         opResult = ddf_fun_bind(hub_dev->hub_fun);
         if (opResult != EOK) {
+                usb_pipe_end_long_transfer(&usb_dev->ctrl_pipe);
                 usb_log_error("Failed to bind hub function: %s.\n",
                    str_error(opResult));
@@ -148 +150 @@
             usb_hub_polling_terminated_callback, hub_dev);
         if (opResult != EOK) {
+                usb_pipe_end_long_transfer(&usb_dev->ctrl_pipe);
                 /* Function is already bound */
                 ddf_fun_unbind(hub_dev->hub_fun);
@@ -159 +162 @@
             hub_dev->usb_device->ddf_dev->name, hub_dev->port_count);
 
+        usb_pipe_end_long_transfer(&usb_dev->ctrl_pipe);
         return EOK;
 }