Changes in uspace/drv/bus/usb/usbhub/usbhub.c [4ca778b:3e6a98c5] in mainline

File:

• uspace/drv/bus/usb/usbhub/usbhub.c (modified) (19 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>
@@ -56 +57 @@
 
 #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 */
@@ -111 +99 @@
         fibril_condvar_initialize(&hub_dev->pending_ops_cv);
 
-        usb_pipe_t *control_pipe = usb_device_get_default_pipe(usb_dev);
-
-        int opResult = usb_pipe_start_long_transfer(control_pipe);
+
+        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",
@@ -123 +110 @@
         opResult = usb_set_first_configuration(usb_dev);
         if (opResult != EOK) {
-                usb_pipe_end_long_transfer(control_pipe);
+                usb_pipe_end_long_transfer(&usb_dev->ctrl_pipe);
                 usb_log_error("Could not set hub configuration: %s\n",
                     str_error(opResult));
@@ -132 +119 @@
         opResult = usb_hub_process_hub_specific_info(hub_dev);
         if (opResult != EOK) {
-                usb_pipe_end_long_transfer(control_pipe);
+                usb_pipe_end_long_transfer(&usb_dev->ctrl_pipe);
                 usb_log_error("Could process hub specific info, %s\n",
                     str_error(opResult));
@@ -140 +127 @@
         /* Create hub control function. */
         usb_log_debug("Creating DDF function '" HUB_FNC_NAME "'.\n");
-        hub_dev->hub_fun = usb_device_ddf_fun_create(hub_dev->usb_device,
+        hub_dev->hub_fun = ddf_fun_create(hub_dev->usb_device->ddf_dev,
             fun_exposed, HUB_FNC_NAME);
         if (hub_dev->hub_fun == NULL) {
-                usb_pipe_end_long_transfer(control_pipe);
+                usb_pipe_end_long_transfer(&usb_dev->ctrl_pipe);
                 usb_log_error("Failed to create hub function.\n");
                 return ENOMEM;
@@ -151 +138 @@
         opResult = ddf_fun_bind(hub_dev->hub_fun);
         if (opResult != EOK) {
-                usb_pipe_end_long_transfer(control_pipe);
+                usb_pipe_end_long_transfer(&usb_dev->ctrl_pipe);
                 usb_log_error("Failed to bind hub function: %s.\n",
                    str_error(opResult));
@@ -159 +146 @@
 
         /* Start hub operation. */
-        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) {
-                usb_pipe_end_long_transfer(control_pipe);
+        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);
                 /* Function is already bound */
                 ddf_fun_unbind(hub_dev->hub_fun);
@@ -174 +160 @@
         hub_dev->running = true;
         usb_log_info("Controlling hub '%s' (%zu ports).\n",
-            usb_device_get_name(hub_dev->usb_device), hub_dev->port_count);
-
-        usb_pipe_end_long_transfer(control_pipe);
+            ddf_dev_get_name(hub_dev->usb_device->ddf_dev), hub_dev->port_count);
+
+        usb_pipe_end_long_transfer(&usb_dev->ctrl_pipe);
         return EOK;
 }
@@ -199 +185 @@
 {
         assert(usb_dev);
-        usb_hub_dev_t *hub = usb_device_data_get(usb_dev);
+        usb_hub_dev_t *hub = usb_dev->driver_data;
         assert(hub);
         unsigned tries = 10;
@@ -213 +199 @@
 
         for (size_t port = 0; port < hub->port_count; ++port) {
-                const int ret = usb_hub_port_fini(&hub->ports[port], hub);
-                if (ret != EOK)
-                        return ret;
+                if (hub->ports[port].attached_device.fun) {
+                        const int ret =
+                            usb_hub_port_fini(&hub->ports[port], hub);
+                        if (ret != EOK)
+                                return ret;
+                }
         }
         free(hub->ports);
@@ -258 +247 @@
 
         /* N + 1 bit indicates change on port N */
-        for (size_t port = 0; port < hub->port_count; ++port) {
+        for (size_t port = 0; port < hub->port_count + 1; port++) {
                 const size_t bit = port + 1;
                 const bool change = (change_bitmap[bit / 8] >> (bit % 8)) & 1;
@@ -284 +273 @@
         /* Get hub descriptor. */
         usb_log_debug("Retrieving descriptor\n");
-        usb_pipe_t *control_pipe =
-            usb_device_get_default_pipe(hub_dev->usb_device);
+        usb_pipe_t *control_pipe = &hub_dev->usb_device->ctrl_pipe;
 
         usb_hub_descriptor_header_t descriptor;
@@ -323 +311 @@
         }
 
-        usb_log_info("Hub port power switching enabled (%s).\n",
-            hub_dev->per_port_power ? "per port" : "ganged");
+        usb_log_info("Hub port power switching enabled.\n");
 
         for (size_t port = 0; port < hub_dev->port_count; ++port) {
@@ -358 +345 @@
         /* Get number of possible configurations from device descriptor */
         const size_t configuration_count =
-            usb_device_descriptors(usb_device)->device.configuration_count;
+            usb_device->descriptors.device.configuration_count;
         usb_log_debug("Hub has %zu configurations.\n", configuration_count);
 
@@ -366 +353 @@
         }
 
-        // TODO: Make sure that the cast is correct
-        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)) {
+        if (usb_device->descriptors.configuration_size
+            < sizeof(usb_standard_configuration_descriptor_t)) {
             usb_log_error("Configuration descriptor is not big enough"
                 " to fit standard configuration descriptor.\n");
@@ -378 +360 @@
         }
 
+        // 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_get_default_pipe(usb_device),
-            config_descriptor->configuration_number);
+            &usb_device->ctrl_pipe, config_descriptor->configuration_number);
         if (opResult != EOK) {
                 usb_log_error("Failed to set hub configuration: %s.\n",
@@ -442 +428 @@
         assert(hub_dev->usb_device);
         usb_log_debug("Global interrupt on a hub\n");
-        usb_pipe_t *control_pipe =
-            usb_device_get_default_pipe(hub_dev->usb_device);
+        usb_pipe_t *control_pipe = &hub_dev->usb_device->ctrl_pipe;
 
         usb_hub_status_t status;
@@ -467 +452 @@
                 /* Ack change in hub OC flag */
                 const int ret = usb_request_clear_feature(
-                    control_pipe, USB_REQUEST_TYPE_CLASS,
+                    &hub_dev->usb_device->ctrl_pipe, USB_REQUEST_TYPE_CLASS,
                     USB_REQUEST_RECIPIENT_DEVICE,
                     USB_HUB_FEATURE_C_HUB_OVER_CURRENT, 0);