Changeset 1c89f74 in mainline for uspace/drv/usbhub/usbhub.c

Timestamp:

2011-04-07T09:00:00Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

9d06563

Parents:

d7f3040

Message:

fix attempt #3

File:

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

uspace/drv/usbhub/usbhub.c

@@ -344 +344 @@
          * these lines allow to reset hub once more, it can be used as
          * brute-force initialization for non-removable devices
-         *
+         */
         opResult = usb_request_set_configuration(hub_info->control_pipe,
                 1);
@@ -351 +351 @@
                         opResult);
                 return opResult;
-        }*/
+        }
 
 
         size_t received_size;
-        opResult = usb_request_get_descriptor(&hub_info->usb_device->ctrl_pipe,
+        opResult = usb_request_get_descriptor(hub_info->control_pipe,
                 USB_REQUEST_TYPE_CLASS, USB_REQUEST_RECIPIENT_DEVICE,
                 USB_DESCTYPE_HUB,
@@ -376 +376 @@
         usb_log_debug("setting port count to %d\n", descriptor->ports_count);
         hub_info->port_count = descriptor->ports_count;
+        /// \TODO check attached_devices array: this is not semantically correct
         hub_info->attached_devs = (usb_hc_attached_device_t*)
                 malloc((hub_info->port_count + 1) *
@@ -381 +382 @@
                 );
         int i;
-        for (i = 0; i < hub_info->port_count + 1; ++i) {
+        for (i = 1; i <= hub_info->port_count; ++i) {
                 hub_info->attached_devs[i].handle = 0;
                 hub_info->attached_devs[i].address = 0;
+                usb_log_info("powering port %d\n",i);
+                opResult = usb_hub_set_port_feature(
+                        hub_info->control_pipe,
+                        i,
+                        USB_HUB_FEATURE_PORT_POWER);
+                if(opResult!=EOK)
+                        usb_log_warning("could not power port %d\n",i);
+
         }
         //handle non-removable devices