Changeset 9f807c3 in mainline

Timestamp:

2012-02-24T04:41:23Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

7f7e6f5

Parents:

dd93bb2

Message:

ohci, lib/usbdev: Fix few endian issues in descriptor retrieving.

Qemu mouse is found and initialized, can be queried via usbinfo, HID driver not working yet.

Location:

uspace

Files:

• drv/bus/usb/ohci/root_hub.c (modified) (3 diffs)
• lib/usbdev/src/request.c (modified) (4 diffs)

uspace/drv/bus/usb/ohci/root_hub.c

@@ -347 +347 @@
             instance->interrupt_mask_size;
 
-        instance->descriptors.configuration.total_length =
+        instance->descriptors.configuration.total_length = uint16_host2usb(
             sizeof(usb_standard_configuration_descriptor_t) +
             sizeof(usb_standard_endpoint_descriptor_t) +
             sizeof(usb_standard_interface_descriptor_t) +
-            instance->hub_descriptor_size;
+            instance->hub_descriptor_size);
 }
 /*----------------------------------------------------------------------------*/
@@ -492 +492 @@
         usb_device_request_setup_packet_t *setup_request =
             (usb_device_request_setup_packet_t *) request->setup_buffer;
-        const int setup_request_value = uint16_usb2host(setup_request->value);
-        switch (setup_request_value)
+        /* "The wValue field specifies the descriptor type in the high byte
+         * and the descriptor index in the low byte (refer to Table 9-5)." */
+        const int desc_type = uint16_usb2host(setup_request->value) >> 8;
+        switch (desc_type)
         {
         case USB_DESCTYPE_HUB:
@@ -540 +542 @@
                     setup_request->value,
                     setup_request->request_type, setup_request->request,
-                    setup_request_value, setup_request->index,
+                    desc_type, setup_request->index,
                     setup_request->length);
                 TRANSFER_END(request, EINVAL);

uspace/lib/usbdev/src/request.c

@@ -114 +114 @@
   *     (in native endianness).
   * @param actual_data_size Actual size of transfered data
-  *     (in native endianness).
+  *        (in native endianness).
   * @return Error code.
   * @retval EBADMEM @p pipe is NULL.
@@ -147 +147 @@
                     | (request_type << 5) | recipient,
                 .request = request,
-                .value = value,
-                .index = index,
-                .length = (uint16_t) data_size,
+                .value = uint16_host2usb(value),
+                .index = uint16_host2usb(index),
+                .length = uint16_host2usb(data_size),
         };
 
@@ -375 +375 @@
         usb_standard_device_descriptor_t descriptor_tmp;
         int rc = usb_request_get_descriptor(pipe,
-            USB_REQUEST_TYPE_STANDARD, USB_REQUEST_RECIPIENT_DEVICE, 
+            USB_REQUEST_TYPE_STANDARD, USB_REQUEST_RECIPIENT_DEVICE,
             USB_DESCTYPE_DEVICE, 0, 0,
             &descriptor_tmp, sizeof(descriptor_tmp),
@@ -435 +435 @@
         /* Everything is okay, copy the descriptor. */
         memcpy(descriptor, &descriptor_tmp, sizeof(descriptor_tmp));
-
+        descriptor->total_length = uint16_usb2host(descriptor_tmp.total_length);
         return EOK;
 }