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

Timestamp:

2018-03-02T20:10:49Z (8 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

f1380b7

Parents:

3061bc1

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-02-28 17:38:31)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-02 20:10:49)

Message:

style: Remove trailing whitespace on _all_ lines, including empty ones, for particular file types.

Command used: tools/srepl '\s\+$' '' -- *.c *.h *.py *.sh *.s *.S *.ag

Currently, whitespace on empty lines is very inconsistent.
There are two basic choices: Either remove the whitespace, or keep empty lines
indented to the level of surrounding code. The former is AFAICT more common,
and also much easier to do automatically.

Alternatively, we could write script for automatic indentation, and use that
instead. However, if such a script exists, it's possible to use the indented
style locally, by having the editor apply relevant conversions on load/save,
without affecting remote repository. IMO, it makes more sense to adopt
the simpler rule.

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;
 }