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

Timestamp:

2016-07-22T08:24:47Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f76d2c2

Parents:

5b18137 (diff), 8351f9a4 (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 from lp:~jan.vesely/helenos/usb

File:

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

uspace/lib/usbhid/src/hidreport.c

@@ -61 +61 @@
         
         usb_dp_parser_data_t parser_data = {
-                .data = dev->descriptors.configuration,
-                .size = dev->descriptors.configuration_size,
+                .data = usb_device_descriptors(dev)->full_config,
+                .size = usb_device_descriptors(dev)->full_config_size,
                 .arg = NULL
         };
@@ -71 +71 @@
         const uint8_t *d =
             usb_dp_get_nested_descriptor(&parser, &parser_data,
-            dev->descriptors.configuration);
+                usb_device_descriptors(dev)->full_config);
         
         /*
@@ -77 +77 @@
          */
         int i = 0;
-        while (d != NULL && i < dev->interface_no) {
+        while (d != NULL && i < usb_device_get_iface_number(dev)) {
                 d = usb_dp_get_sibling_descriptor(&parser, &parser_data,
-                    dev->descriptors.configuration, d);
+                    usb_device_descriptors(dev)->full_config, d);
                 ++i;
         }
@@ -85 +85 @@
         if (d == NULL) {
                 usb_log_error("The %d. interface descriptor not found!\n",
-                    dev->interface_no);
+                    usb_device_get_iface_number(dev));
                 return ENOENT;
         }
@@ -135 +135 @@
          * Get the descriptor from the device.
          */
-        int rc = usb_request_get_descriptor(&dev->ctrl_pipe,
+        int rc = usb_request_get_descriptor(usb_device_get_default_pipe(dev),
             USB_REQUEST_TYPE_STANDARD, USB_REQUEST_RECIPIENT_INTERFACE,
-            USB_DESCTYPE_HID_REPORT, 0, dev->interface_no,
+            USB_DESCTYPE_HID_REPORT, 0, usb_device_get_iface_number(dev),
             *report_desc, length, &actual_size);