Changes in uspace/lib/usbhid/src/hidreport.c [a35b458:ae3a941] in mainline

File:

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

uspace/lib/usbhid/src/hidreport.c

@@ -55 +55 @@
         assert(report_desc != NULL);
         assert(size != NULL);
-
+        
         usb_dp_parser_t parser =  {
                 .nesting = usb_dp_standard_descriptor_nesting
         };
-
+        
         usb_dp_parser_data_t parser_data = {
                 .data = usb_device_descriptors(dev)->full_config,
@@ -65 +65 @@
                 .arg = NULL
         };
-
+        
         /*
          * First nested descriptor of the configuration descriptor.
@@ -72 +72 @@
             usb_dp_get_nested_descriptor(&parser, &parser_data,
             usb_device_descriptors(dev)->full_config);
-
+        
         /*
          * Find the interface descriptor corresponding to our interface number.
@@ -82 +82 @@
                 ++i;
         }
-
+        
         if (d == NULL) {
                 usb_log_error("The %d. interface descriptor not found!",
@@ -88 +88 @@
                 return ENOENT;
         }
-
+        
         /*
          * First nested descriptor of the interface descriptor.
@@ -94 +94 @@
         const uint8_t *iface_desc = d;
         d = usb_dp_get_nested_descriptor(&parser, &parser_data, iface_desc);
-
+        
         /*
          * Search through siblings until the HID descriptor is found.
@@ -102 +102 @@
                     iface_desc, d);
         }
-
+        
         if (d == NULL) {
                 usb_log_fatal("No HID descriptor found!");
                 return ENOENT;
         }
-
+        
         if (*d != sizeof(usb_standard_hid_descriptor_t)) {
                 usb_log_error("HID descriptor has wrong size (%u, expected %zu"
@@ -113 +113 @@
                 return EINVAL;
         }
-
+        
         usb_standard_hid_descriptor_t *hid_desc =
             (usb_standard_hid_descriptor_t *)d;
-
+        
         uint16_t length = uint16_usb2host(hid_desc->report_desc_info.length);
         size_t actual_size = 0;
@@ -129 +129 @@
                 return ENOMEM;
         }
-
+        
         usb_log_debug("Getting Report descriptor, expected size: %u", length);
-
+        
         /*
          * Get the descriptor from the device.
@@ -153 +153 @@
                 return EINVAL;
         }
-
+        
         *size = length;
-
+        
         usb_log_debug("Done.");
-
+        
         return EOK;
 }
@@ -171 +171 @@
                 return EINVAL;
         }
-
+        
 //      uint8_t *report_desc = NULL;
 //      size_t report_size;
-
+        
         errno_t rc = usb_hid_get_report_descriptor(dev, report_desc, report_size);
-
+        
         if (rc != EOK) {
                 usb_log_error("Problem with getting Report descriptor: %s.",
@@ -186 +186 @@
                 return rc;
         }
-
+        
         assert(*report_desc != NULL);
-
+        
         rc = usb_hid_parse_report_descriptor(report, *report_desc, *report_size);
         if (rc != EOK) {
@@ -197 +197 @@
                 return rc;
         }
-
+        
         usb_hid_descriptor_print(report);
-
+        
         return EOK;
 }