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

Timestamp:

2011-09-23T13:44:12Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

442fa6b

Parents:

a590a23

Message:

usbhub: Add pipe and port number to port structure.

Use these fields in feature set/clear.

File:

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

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

@@ -73 +73 @@
  * @return Operation result
  */
-int usb_hub_clear_port_feature(usb_pipe_t *pipe,
-    int port_index, usb_hub_class_feature_t feature)
-{
+int usb_hub_clear_port_feature(
+    usb_hub_port_t *port, usb_hub_class_feature_t feature)
+{
+        assert(port);
         usb_device_request_setup_packet_t clear_request = {
                 .request_type = USB_HUB_REQ_TYPE_CLEAR_PORT_FEATURE,
                 .request = USB_DEVREQ_CLEAR_FEATURE,
                 .value = feature,
-                .index = port_index,
+                .index = port->port_number,
                 .length = 0,
         };
-        return usb_pipe_control_write(pipe, &clear_request,
+        return usb_pipe_control_write(port->control_pipe, &clear_request,
             sizeof(clear_request), NULL, 0);
 }
@@ -96 +97 @@
  * @return Operation result
  */
-int usb_hub_set_port_feature(usb_pipe_t *pipe,
-    int port_index, usb_hub_class_feature_t feature)
-{
-
+int usb_hub_set_port_feature(
+    usb_hub_port_t *port, usb_hub_class_feature_t feature)
+{
+        assert(port);
         usb_device_request_setup_packet_t clear_request = {
                 .request_type = USB_HUB_REQ_TYPE_SET_PORT_FEATURE,
                 .request = USB_DEVREQ_SET_FEATURE,
-                .index = port_index,
+                .index = port->port_number,
                 .value = feature,
                 .length = 0,
         };
-        return usb_pipe_control_write(pipe, &clear_request,
+        return usb_pipe_control_write(port->control_pipe, &clear_request,
             sizeof(clear_request), NULL, 0);
 }
@@ -139 +140 @@
                 /* ACK the change */
                 const int opResult =
-                    usb_hub_clear_port_feature(hub->control_pipe,
-                    port, USB_HUB_FEATURE_C_PORT_CONNECTION);
+                    usb_hub_clear_port_feature(&hub->ports[port],
+                        USB_HUB_FEATURE_C_PORT_CONNECTION);
                 if (opResult != EOK) {
                         usb_log_warning("Failed to clear "
@@ -266 +267 @@
 
         /* Clear the port reset change. */
-        int rc = usb_hub_clear_port_feature(hub->control_pipe,
-            port, USB_HUB_FEATURE_C_PORT_RESET);
+        int rc = usb_hub_clear_port_feature(&hub->ports[port],
+            USB_HUB_FEATURE_C_PORT_RESET);
         if (rc != EOK) {
                 usb_log_error("Failed to clear port %d reset feature: %s.\n",
@@ -326 +327 @@
 static int enable_port_callback(int port_no, void *arg)
 {
-        usb_hub_info_t *hub = arg;
-        assert(hub);
-        usb_hub_port_t *my_port = hub->ports + port_no;
-        const int rc = usb_hub_set_port_feature(hub->control_pipe,
-                port_no, USB_HUB_FEATURE_PORT_RESET);
+        usb_hub_port_t *port = arg;
+        const int rc =
+            usb_hub_set_port_feature(port, USB_HUB_FEATURE_PORT_RESET);
         if (rc != EOK) {
                 usb_log_warning("Port reset failed: %s.\n", str_error(rc));
@@ -339 +338 @@
          * Wait until reset completes.
          */
-        fibril_mutex_lock(&my_port->reset_mutex);
-        while (!my_port->reset_completed) {
-                fibril_condvar_wait(&my_port->reset_cv, &my_port->reset_mutex);
-        }
-        fibril_mutex_unlock(&my_port->reset_mutex);
-
-        if (my_port->reset_okay) {
+        fibril_mutex_lock(&port->reset_mutex);
+        while (!port->reset_completed) {
+                fibril_condvar_wait(&port->reset_cv, &port->reset_mutex);
+        }
+        fibril_mutex_unlock(&port->reset_mutex);
+
+        if (port->reset_okay) {
                 return EOK;
         } else {
@@ -370 +369 @@
         const int rc = usb_hc_new_device_wrapper(data->hub->usb_device->ddf_dev,
             &data->hub->connection, data->speed,
-            enable_port_callback, (int) data->port, data->hub,
+            enable_port_callback, (int) data->port,
+            &data->hub->ports[data->port],
             &new_address, &child_handle,
             NULL, NULL, NULL);