Changeset 3f3afb9 in mainline for uspace/drv/usbhub/usbhub.c

Timestamp:

2011-04-11T20:38:37Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

1324ff3, a39cfb8

Parents:

58226b4 (diff), d91645ab (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:

forgotten hub port powering

File:

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

uspace/drv/usbhub/usbhub.c

@@ -179 +179 @@
 }
 
-/**
- * release default address used by given hub
- *
- * Also unsets hub->is_default_address_used. Convenience wrapper function.
- * @note hub->connection MUST be open for communication
- * @param hub hub representation
- * @return error code
- */
-int usb_hub_release_default_address(usb_hub_info_t * hub) {
-        int opResult = usb_hc_release_default_address(&hub->connection);
-        if (opResult != EOK) {
-                usb_log_error("could not release default address, errno %d\n",
-                    opResult);
-                return opResult;
-        }
-        hub->is_default_address_used = false;
-        return EOK;
-}
-
 
 //*********************************************
@@ -266 +247 @@
         for (port = 0; port < hub_info->port_count + 1; port++) {
                 usb_hub_port_init(&hub_info->ports[port]);
+        }
+        for (port = 0; port < hub_info->port_count; port++) {
                 opResult = usb_hub_set_port_feature(hub_info->control_pipe,
-                    port, USB_HUB_FEATURE_PORT_POWER);
+                    port+1, USB_HUB_FEATURE_PORT_POWER);
                 if (opResult != EOK) {
                         usb_log_error("cannot power on port %d;  %d\n",
-                            port, opResult);
+                            port+1, opResult);
                 }
         }