Changes in uspace/lib/usbhid/src/hidreport.c [e2dfa86:9d58539] in mainline

File:

• uspace/lib/usbhid/src/hidreport.c (modified) (9 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)
 {
@@ -61 +61 @@
         
         usb_dp_parser_data_t parser_data = {
-                .data = usb_device_descriptors(dev)->full_config,
-                .size = usb_device_descriptors(dev)->full_config_size,
+                .data = dev->descriptors.configuration,
+                .size = dev->descriptors.configuration_size,
                 .arg = NULL
         };
@@ -69 +69 @@
          * First nested descriptor of the configuration descriptor.
          */
-        const uint8_t *d =
-            usb_dp_get_nested_descriptor(&parser, &parser_data,
-                usb_device_descriptors(dev)->full_config);
+        const uint8_t *d = 
+            usb_dp_get_nested_descriptor(&parser, &parser_data, 
+            dev->descriptors.configuration);
         
         /*
@@ -77 +77 @@
          */
         int i = 0;
-        while (d != NULL && i < usb_device_get_iface_number(dev)) {
-                d = usb_dp_get_sibling_descriptor(&parser, &parser_data,
-                    usb_device_descriptors(dev)->full_config, d);
+        while (d != NULL && i < dev->interface_no) {
+                d = usb_dp_get_sibling_descriptor(&parser, &parser_data, 
+                    dev->descriptors.configuration, d);
                 ++i;
         }
@@ -85 +85 @@
         if (d == NULL) {
                 usb_log_error("The %d. interface descriptor not found!\n",
-                    usb_device_get_iface_number(dev));
+                    dev->interface_no);
                 return ENOENT;
         }
@@ -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 = uint16_usb2host(hid_desc->report_desc_info.length);
+        uint16_t length =  hid_desc->report_desc_info.length;
         size_t actual_size = 0;
 
@@ -135 +135 @@
          * Get the descriptor from the device.
          */
-        int rc = usb_request_get_descriptor(usb_device_get_default_pipe(dev),
+        int rc = usb_request_get_descriptor(&dev->ctrl_pipe,
             USB_REQUEST_TYPE_STANDARD, USB_REQUEST_RECIPIENT_INTERFACE,
-            USB_DESCTYPE_HID_REPORT, 0, usb_device_get_iface_number(dev),
+            USB_DESCTYPE_HID_REPORT, 0, dev->interface_no,
             *report_desc, length, &actual_size);
 
@@ -161 +161 @@
 }
 
-
+/*----------------------------------------------------------------------------*/
 
 int usb_hid_process_report_descriptor(usb_device_t *dev,