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

Timestamp:

2011-09-23T14:17:59Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

3b617579

Parents:

c0587d90

Message:

usbhub: More functions use new usb_hub_port_t elements.

Use per port mutex, for more than just waiting for reset to complete.
Remove shared port_mutex from the hub structure.

File:

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

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

@@ -187 +187 @@
                 const bool change = (change_bitmap[port / 8] >> (port % 8)) & 1;
                 if (change) {
-                        usb_hub_process_port_interrupt(hub, port);
+                        usb_hub_port_process_interrupt(hub, port);
                 }
         }
@@ -217 +217 @@
         info->ports = NULL;
         info->port_count = -1;
-        fibril_mutex_initialize(&info->port_mutex);
         fibril_mutex_initialize(&info->pending_ops_mutex);
         fibril_condvar_initialize(&info->pending_ops_cv);
@@ -289 +288 @@
                 for (port = 1; port <= hub_info->port_count; ++port) {
                         usb_log_debug("Powering port %zu.\n", port);
-                        opResult = usb_hub_set_port_feature(
+                        opResult = usb_hub_port_set_feature(
                             &hub_info->ports[port], USB_HUB_FEATURE_PORT_POWER);
                         if (opResult != EOK) {
@@ -365 +364 @@
                  * switch them all off to prevent damage. */
                 //TODO Consider ganged power switching here.
+                //TODO Hub should have turned the ports off already,
+                //this is redundant.
                 size_t port;
                 for (port = 1; port <= hub_info->port_count; ++port) {
-                        const int opResult = usb_hub_clear_port_feature(
+                        const int opResult = usb_hub_port_clear_feature(
                             &hub_info->ports[port], USB_HUB_FEATURE_PORT_POWER);
                         if (opResult != EOK) {
@@ -381 +382 @@
                 size_t port;
                 for (port = 1; port <= hub_info->port_count; ++port) {
-                        const int opResult = usb_hub_set_port_feature(
+                        const int opResult = usb_hub_port_set_feature(
                             &hub_info->ports[port], USB_HUB_FEATURE_PORT_POWER);
                         if (opResult != EOK) {
@@ -478 +479 @@
          */
         if (hub->pending_ops_count > 0) {
-                fibril_mutex_lock(&hub->port_mutex);
                 size_t port;
                 for (port = 0; port < hub->port_count; port++) {
-                        usb_hub_port_t *the_port = hub->ports + port;
-                        fibril_mutex_lock(&the_port->reset_mutex);
-                        the_port->reset_completed = true;
-                        the_port->reset_okay = false;
-                        fibril_condvar_broadcast(&the_port->reset_cv);
-                        fibril_mutex_unlock(&the_port->reset_mutex);
+                        usb_hub_port_reset_fail(&hub->ports[port]);
                 }
-                fibril_mutex_unlock(&hub->port_mutex);
         }
         /* And now wait for them. */