Changeset dbb9663 in mainline

Timestamp:

2011-07-11T12:22:56Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

5fd0dc23

Parents:

01bbbb2

Message:

libusb: Fix hub descriptor parsing: USB is little endian.

usbhub: Fix checks for power capabilities.

Location:

uspace/drv/bus/usb/usbhub

Files:

• usbhub.c (modified) (2 diffs)
• utils.c (modified) (1 diff)

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

@@ -249 +249 @@
         usb_log_debug("setting port count to %d\n", descriptor->ports_count);
         hub_info->port_count = descriptor->ports_count;
-        bool is_power_switched =
-            ((descriptor->hub_characteristics & 1) == 0);
-        bool has_individual_port_powering =
-            ((descriptor->hub_characteristics & 1) != 0);
+        const bool is_power_switched =
+            ((descriptor->hub_characteristics & 0x2) == 0);
         hub_info->ports = malloc(
             sizeof (usb_hub_port_t) * (hub_info->port_count + 1));
@@ -264 +262 @@
         if (is_power_switched) {
                 usb_log_debug("Hub power switched\n");
+                const bool has_individual_port_powering =
+                    descriptor->hub_characteristics & 0x1;
 
                 if (!has_individual_port_powering) {

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

@@ -147 +147 @@
         descriptor->ports_count = sdescriptor[2];
         /// @fixme handling of endianness??
-        descriptor->hub_characteristics = sdescriptor[4] + 256 * sdescriptor[3];
+        descriptor->hub_characteristics = sdescriptor[3] + 256 * sdescriptor[4];
         descriptor->pwr_on_2_good_time = sdescriptor[5];
         descriptor->current_requirement = sdescriptor[6];