Changeset f13381b in mainline

Timestamp:

2011-04-12T09:14:42Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

d017cea

Parents:

9f104af4 (diff), 1324ff3 (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:

Development branch changes

Location:

uspace/drv

Files:

• ohci/ohci.ma (modified) (1 diff)
• usbhub/usbhub.c (modified) (1 diff)

uspace/drv/ohci/ohci.ma

@@ -1 +1 @@
 10 pci/ven=106b&dev=003f
+10 pci/ven=10de&dev=0aa5
+10 pci/ven=10de&dev=0aa5

uspace/drv/usbhub/usbhub.c

@@ -247 +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+1, USB_HUB_FEATURE_PORT_POWER);
+                if (opResult != EOK) {
+                        usb_log_error("cannot power on port %d;  %d\n",
+                            port+1, opResult);
+                }
         }
         usb_log_debug2("freeing data\n");