Changeset 37fce70 in mainline

Timestamp:

2018-01-21T20:12:10Z (6 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

36e8a0c8

Parents:

cd0cf81

Message:

usbhub: move powering ports to a separate fuction

File:

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

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

@@ -299 +299 @@
 }
 
+static void usb_hub_power_ports(usb_hub_dev_t *hub_dev)
+{
+        if (hub_dev->power_switched) {
+                usb_log_info("(%p): Power switching not supported, "
+                    "ports always powered.", hub_dev);
+                return;
+        }
+
+        usb_log_info("(%p): Hub port power switching enabled (%s).", hub_dev,
+            hub_dev->per_port_power ? "per port" : "ganged");
+
+        for (unsigned int port = 0; port < hub_dev->port_count; ++port) {
+                usb_log_debug("(%p): Powering port %u.", hub_dev, port + 1);
+                const int ret = usb_hub_set_port_feature(hub_dev, port + 1, USB_HUB_FEATURE_PORT_POWER);
+
+                if (ret != EOK) {
+                        usb_log_error("(%p-%u): Cannot power on port: %s.",
+                            hub_dev, hub_dev->ports[port].port_number,
+                            str_error(ret));
+                        /* Continue to try at least other ports */
+                }
+        }
+}
+
 /**
  * Load hub-specific information into hub_dev structure and process if needed
@@ -360 +384 @@
             descriptor.characteristics & HUB_CHAR_POWER_PER_PORT_FLAG;
 
-        if (!hub_dev->power_switched) {
-                usb_log_info("(%p): Power switching not supported, "
-                    "ports always powered.", hub_dev);
-                return EOK;
-        }
-
-        usb_log_info("(%p): Hub port power switching enabled (%s).", hub_dev,
-            hub_dev->per_port_power ? "per port" : "ganged");
-
-        for (unsigned int port = 0; port < hub_dev->port_count; ++port) {
-                usb_log_debug("(%p): Powering port %u.", hub_dev, port + 1);
-                const int ret = usb_hub_set_port_feature(hub_dev, port + 1, USB_HUB_FEATURE_PORT_POWER);
-
-                if (ret != EOK) {
-                        usb_log_error("(%p-%u): Cannot power on port: %s.",
-                            hub_dev, hub_dev->ports[port].port_number,
-                            str_error(ret));
-                } else {
-                        if (!hub_dev->per_port_power) {
-                                usb_log_debug("(%p) Ganged power switching, port %u is probably already powered.", hub_dev, port + 1);
-                        } else {
-                                usb_log_warning("(%p): Failed to power port %u.", hub_dev, port + 1);
-                        }
-                }
-        }
+        usb_hub_power_ports(hub_dev);
+
         return EOK;
 }