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

Timestamp:

2016-07-22T08:24:47Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f76d2c2

Parents:

5b18137 (diff), 8351f9a4 (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 from lp:~jan.vesely/helenos/usb

File:

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

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

@@ -45 +45 @@
 #include <usb/dev/pipes.h>
 #include <usb/classes/classes.h>
-#include <usb/ddfiface.h>
 #include <usb/descriptor.h>
 #include <usb/dev/recognise.h>
@@ -57 +56 @@
 
 #define HUB_FNC_NAME "hub"
+/** Hub status-change endpoint description.
+ *
+ * For more information see section 11.15.1 of USB 1.1 specification.
+ */
+const usb_endpoint_description_t hub_status_change_endpoint_description =
+{
+        .transfer_type = USB_TRANSFER_INTERRUPT,
+        .direction = USB_DIRECTION_IN,
+        .interface_class = USB_CLASS_HUB,
+        .interface_subclass = 0,
+        .interface_protocol = 0,
+        .flags = 0
+};
 
 /** Standard get hub global status request */
@@ -99 +111 @@
         fibril_condvar_initialize(&hub_dev->pending_ops_cv);
 
-
-        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;
-        }
-
         /* Set hub's first configuration. (There should be only one) */
-        opResult = usb_set_first_configuration(usb_dev);
-        if (opResult != EOK) {
-                usb_pipe_end_long_transfer(&usb_dev->ctrl_pipe);
+        int opResult = usb_set_first_configuration(usb_dev);
+        if (opResult != EOK) {
                 usb_log_error("Could not set hub configuration: %s\n",
                     str_error(opResult));
@@ -119 +122 @@
         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));
@@ -127 +129 @@
         /* Create hub control function. */
         usb_log_debug("Creating DDF function '" HUB_FNC_NAME "'.\n");
-        hub_dev->hub_fun = ddf_fun_create(hub_dev->usb_device->ddf_dev,
+        hub_dev->hub_fun = usb_device_ddf_fun_create(hub_dev->usb_device,
             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;
@@ -138 +139 @@
         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));
@@ -146 +146 @@
 
         /* Start hub operation. */
-        opResult = usb_device_auto_poll(hub_dev->usb_device, 0,
-            hub_port_changes_callback, ((hub_dev->port_count + 1 + 8) / 8),
-            usb_hub_polling_terminated_callback, hub_dev);
-        if (opResult != EOK) {
-                usb_pipe_end_long_transfer(&usb_dev->ctrl_pipe);
+        opResult = usb_device_auto_poll_desc(hub_dev->usb_device,
+            &hub_status_change_endpoint_description,
+            hub_port_changes_callback, ((hub_dev->port_count + 1 + 7) / 8),
+            -1, usb_hub_polling_terminated_callback, hub_dev);
+        if (opResult != EOK) {
                 /* Function is already bound */
                 ddf_fun_unbind(hub_dev->hub_fun);
@@ -159 +159 @@
         }
         hub_dev->running = true;
-        usb_log_info("Controlling hub '%s' (%zu ports).\n",
-            ddf_dev_get_name(hub_dev->usb_device->ddf_dev), hub_dev->port_count);
-
-        usb_pipe_end_long_transfer(&usb_dev->ctrl_pipe);
+        usb_log_info("Controlling hub '%s' (%p: %zu ports).\n",
+            usb_device_get_name(hub_dev->usb_device), hub_dev,
+            hub_dev->port_count);
+
         return EOK;
 }
@@ -185 +185 @@
 {
         assert(usb_dev);
-        usb_hub_dev_t *hub = usb_dev->driver_data;
+        usb_hub_dev_t *hub = usb_device_data_get(usb_dev);
         assert(hub);
         unsigned tries = 10;
@@ -191 +191 @@
                 async_usleep(100000);
                 if (!tries--) {
-                        usb_log_error("Can't remove hub, still running.\n");
+                        usb_log_error("(%p): Can't remove hub, still running.",
+                            hub);
                         return EBUSY;
                 }
@@ -199 +200 @@
 
         for (size_t port = 0; port < hub->port_count; ++port) {
-                if (hub->ports[port].attached_device.fun) {
-                        const int ret =
-                            usb_hub_port_fini(&hub->ports[port], hub);
-                        if (ret != EOK)
-                                return ret;
-                }
+                const int ret = usb_hub_port_fini(&hub->ports[port], hub);
+                if (ret != EOK)
+                        return ret;
         }
         free(hub->ports);
@@ -210 +208 @@
         const int ret = ddf_fun_unbind(hub->hub_fun);
         if (ret != EOK) {
-                usb_log_error("Failed to unbind '%s' function: %s.\n",
-                   HUB_FNC_NAME, str_error(ret));
+                usb_log_error("(%p) Failed to unbind '%s' function: %s.",
+                   hub, HUB_FNC_NAME, str_error(ret));
                 return ret;
         }
         ddf_fun_destroy(hub->hub_fun);
 
-        usb_log_info("USB hub driver, stopped and cleaned.\n");
+        usb_log_info("(%p) USB hub driver stopped and cleaned.", hub);
         return EOK;
 }
@@ -231 +229 @@
     uint8_t *change_bitmap, size_t change_bitmap_size, void *arg)
 {
-        usb_log_debug("hub_port_changes_callback\n");
+//      usb_log_debug("hub_port_changes_callback\n");
         usb_hub_dev_t *hub = arg;
         assert(hub);
@@ -247 +245 @@
 
         /* N + 1 bit indicates change on port N */
-        for (size_t port = 0; port < hub->port_count + 1; port++) {
+        for (size_t port = 0; port < hub->port_count; ++port) {
                 const size_t bit = port + 1;
                 const bool change = (change_bitmap[bit / 8] >> (bit % 8)) & 1;
@@ -272 +270 @@
 
         /* Get hub descriptor. */
-        usb_log_debug("Retrieving descriptor\n");
-        usb_pipe_t *control_pipe = &hub_dev->usb_device->ctrl_pipe;
+        usb_log_debug("(%p): Retrieving descriptor.", hub_dev);
+        usb_pipe_t *control_pipe =
+            usb_device_get_default_pipe(hub_dev->usb_device);
 
         usb_hub_descriptor_header_t descriptor;
@@ -282 +281 @@
             sizeof(usb_hub_descriptor_header_t), &received_size);
         if (opResult != EOK) {
-                usb_log_error("Failed to receive hub descriptor: %s.\n",
-                    str_error(opResult));
+                usb_log_error("(%p): Failed to receive hub descriptor: %s.\n",
+                    hub_dev, str_error(opResult));
                 return opResult;
         }
 
-        usb_log_debug("Setting port count to %d.\n", descriptor.port_count);
+        usb_log_debug("(%p): Setting port count to %d.\n", hub_dev,
+            descriptor.port_count);
         hub_dev->port_count = descriptor.port_count;
 
@@ -306 +306 @@
 
         if (!hub_dev->power_switched) {
-                usb_log_info(
-                   "Power switching not supported, ports always powered.\n");
+                usb_log_info("(%p): Power switching not supported, "
+                    "ports always powered.", hub_dev);
                 return EOK;
         }
 
-        usb_log_info("Hub port power switching enabled.\n");
-
-        for (size_t port = 0; port < hub_dev->port_count; ++port) {
-                usb_log_debug("Powering port %zu.\n", port);
+        usb_log_info("(%p): Hub port power switching enabled (%s).\n", hub_dev,
+            hub_dev->per_port_power ? "per port" : "ganged");
+
+        for (unsigned port = 0; port < hub_dev->port_count; ++port) {
+                usb_log_debug("(%p): Powering port %u.", hub_dev, port);
                 const int ret = usb_hub_port_set_feature(
                     &hub_dev->ports[port], USB_HUB_FEATURE_PORT_POWER);
 
                 if (ret != EOK) {
-                        usb_log_error("Cannot power on port %zu: %s.\n",
-                            hub_dev->ports[port].port_number, str_error(ret));
+                        usb_log_error("(%p-%u): Cannot power on port: %s.\n",
+                            hub_dev, hub_dev->ports[port].port_number,
+                            str_error(ret));
                 } else {
                         if (!hub_dev->per_port_power) {
-                                usb_log_debug("Ganged power switching, "
-                                    "one port is enough.\n");
+                                usb_log_debug("(%p) Ganged power switching, "
+                                    "one port is enough.", hub_dev);
                                 break;
                         }
@@ -345 +347 @@
         /* Get number of possible configurations from device descriptor */
         const size_t configuration_count =
-            usb_device->descriptors.device.configuration_count;
+            usb_device_descriptors(usb_device)->device.configuration_count;
         usb_log_debug("Hub has %zu configurations.\n", configuration_count);
 
@@ -353 +355 @@
         }
 
-        if (usb_device->descriptors.configuration_size
-            < sizeof(usb_standard_configuration_descriptor_t)) {
+        const size_t config_size =
+            usb_device_descriptors(usb_device)->full_config_size;
+        const usb_standard_configuration_descriptor_t *config_descriptor =
+            usb_device_descriptors(usb_device)->full_config;
+
+        if (config_size < sizeof(usb_standard_configuration_descriptor_t)) {
             usb_log_error("Configuration descriptor is not big enough"
                 " to fit standard configuration descriptor.\n");
@@ -360 +366 @@
         }
 
-        // TODO: Make sure that the cast is correct
-        usb_standard_configuration_descriptor_t *config_descriptor
-            = (usb_standard_configuration_descriptor_t *)
-            usb_device->descriptors.configuration;
-
         /* Set configuration. Use the configuration that was in
          * usb_device->descriptors.configuration i.e. The first one. */
         const int opResult = usb_request_set_configuration(
-            &usb_device->ctrl_pipe, config_descriptor->configuration_number);
+            usb_device_get_default_pipe(usb_device),
+            config_descriptor->configuration_number);
         if (opResult != EOK) {
                 usb_log_error("Failed to set hub configuration: %s.\n",
@@ -392 +394 @@
         if (status & USB_HUB_STATUS_OVER_CURRENT) {
                 /* Hub should remove power from all ports if it detects OC */
-                usb_log_warning("Detected hub over-current condition, "
-                    "all ports should be powered off.");
+                usb_log_warning("(%p) Detected hub over-current condition, "
+                    "all ports should be powered off.", hub_dev);
                 return;
         }
@@ -406 +408 @@
                     &hub_dev->ports[port], USB_HUB_FEATURE_PORT_POWER);
                 if (ret != EOK) {
-                        usb_log_warning("HUB OVER-CURRENT GONE: Cannot power on"
-                            " port %zu: %s\n", hub_dev->ports[port].port_number,
-                            str_error(ret));
+                        usb_log_warning("(%p-%u): HUB OVER-CURRENT GONE: Cannot"
+                            " power on port: %s\n", hub_dev,
+                            hub_dev->ports[port].port_number, str_error(ret));
                 } else {
                         if (!hub_dev->per_port_power)
@@ -427 +429 @@
         assert(hub_dev);
         assert(hub_dev->usb_device);
-        usb_log_debug("Global interrupt on a hub\n");
-        usb_pipe_t *control_pipe = &hub_dev->usb_device->ctrl_pipe;
+        usb_log_debug("(%p): Global interrupt on th hub.",  hub_dev);
+        usb_pipe_t *control_pipe =
+            usb_device_get_default_pipe(hub_dev->usb_device);
 
         usb_hub_status_t status;
@@ -438 +441 @@
             &status, sizeof(usb_hub_status_t), &rcvd_size);
         if (opResult != EOK) {
-                usb_log_error("Could not get hub status: %s\n",
+                usb_log_error("(%p): Could not get hub status: %s.", hub_dev,
                     str_error(opResult));
                 return;
         }
         if (rcvd_size != sizeof(usb_hub_status_t)) {
-                usb_log_error("Received status has incorrect size\n");
+                usb_log_error("(%p): Received status has incorrect size: "
+                    "%zu != %zu", hub_dev, rcvd_size, sizeof(usb_hub_status_t));
                 return;
         }
@@ -452 +456 @@
                 /* Ack change in hub OC flag */
                 const int ret = usb_request_clear_feature(
-                    &hub_dev->usb_device->ctrl_pipe, USB_REQUEST_TYPE_CLASS,
+                    control_pipe, USB_REQUEST_TYPE_CLASS,
                     USB_REQUEST_RECIPIENT_DEVICE,
                     USB_HUB_FEATURE_C_HUB_OVER_CURRENT, 0);
                 if (ret != EOK) {
-                        usb_log_error("Failed to clear hub over-current "
-                            "change flag: %s.\n", str_error(opResult));
+                        usb_log_error("(%p): Failed to clear hub over-current "
+                            "change flag: %s.\n", hub_dev, str_error(opResult));
                 }
         }
@@ -480 +484 @@
                     USB_HUB_FEATURE_C_HUB_LOCAL_POWER, 0);
                 if (opResult != EOK) {
-                        usb_log_error("Failed to clear hub power change "
-                            "flag: %s.\n", str_error(ret));
+                        usb_log_error("(%p): Failed to clear hub power change "
+                            "flag: %s.\n", hub_dev, str_error(ret));
                 }
         }