Changeset 72cf064 in mainline for uspace/lib/usbhid/src/hidreport.c

Timestamp:

2012-08-13T17:17:04Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

33fee91

Parents:

f4a8734 (diff), 4820360 (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:

Merge mainline changes

File:

• uspace/lib/usbhid/src/hidreport.c (modified) (6 diffs)

uspace/lib/usbhid/src/hidreport.c

@@ -50 +50 @@
 #include <usb/hid/hidreport.h>
 
-static int usb_hid_get_report_descriptor(usb_device_t *dev, 
+static int usb_hid_get_report_descriptor(usb_device_t *dev,
     uint8_t **report_desc, size_t *size)
 {
@@ -69 +69 @@
          * First nested descriptor of the configuration descriptor.
          */
-        const uint8_t *d = 
-            usb_dp_get_nested_descriptor(&parser, &parser_data, 
+        const uint8_t *d =
+            usb_dp_get_nested_descriptor(&parser, &parser_data,
             dev->descriptors.configuration);
         
@@ -78 +78 @@
         int i = 0;
         while (d != NULL && i < dev->interface_no) {
-                d = usb_dp_get_sibling_descriptor(&parser, &parser_data, 
+                d = usb_dp_get_sibling_descriptor(&parser, &parser_data,
                     dev->descriptors.configuration, d);
                 ++i;
@@ -99 +99 @@
          */
         while (d != NULL && *(d + 1) != USB_DESCTYPE_HID) {
-                d = usb_dp_get_sibling_descriptor(&parser, &parser_data, 
+                d = usb_dp_get_sibling_descriptor(&parser, &parser_data,
                     iface_desc, d);
         }
@@ -114 +114 @@
         }
         
-        usb_standard_hid_descriptor_t *hid_desc = 
+        usb_standard_hid_descriptor_t *hid_desc =
             (usb_standard_hid_descriptor_t *)d;
         
-        uint16_t length =  hid_desc->report_desc_info.length;
+        uint16_t length = uint16_usb2host(hid_desc->report_desc_info.length);
         size_t actual_size = 0;
 
@@ -161 +161 @@
 }
 
-/*----------------------------------------------------------------------------*/
+
 
 int usb_hid_process_report_descriptor(usb_device_t *dev,