Changeset fb2ef35 in mainline

Timestamp:

2011-12-11T20:17:05Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

4c67e52

Parents:

c6d5f08

Message:

usbhub: Use usb_device_T provided hc_connection.

Start long transfer on control pipe before descriptor and settings manipulation.

Location:

uspace/drv/bus/usb/usbhub

Files:

• port.c (modified) (2 diffs)
• usbhub.c (modified) (7 diffs)
• usbhub.h (modified) (1 diff)

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_hc_unregister_device(&hub->usb_device->hc_conn,
+            port->attached_device.address);
+        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);
 

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;
 }

uspace/drv/bus/usb/usbhub/usbhub.h

@@ -57 +57 @@
         /** Port structures, one for each port */
         usb_hub_port_t *ports;
-        /** Connection to hcd */
-        usb_hc_connection_t connection;
         /** Generic usb device data*/
         usb_device_t *usb_device;