Changeset 3bacee1 in mainline for uspace/lib/usb/src/dump.c

Timestamp:

2018-04-12T16:27:17Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

3cf22f9

Parents:

76d0981d

git-author:

Jiri Svoboda <jiri@…> (2018-04-11 19:25:33)

git-committer:

Jiri Svoboda <jiri@…> (2018-04-12 16:27:17)

Message:

Make ccheck-fix again and commit more good files.

File:

• uspace/lib/usb/src/dump.c (modified) (11 diffs)

uspace/lib/usb/src/dump.c

@@ -140 +140 @@
     const uint8_t *descriptor, size_t descriptor_length)
 {
-        usb_standard_device_descriptor_t *d
-            = (usb_standard_device_descriptor_t *) descriptor;
+        usb_standard_device_descriptor_t *d =
+            (usb_standard_device_descriptor_t *) descriptor;
         if (descriptor_length < sizeof(*d)) {
                 return;
@@ -167 +167 @@
     const uint8_t *descriptor, size_t descriptor_length)
 {
-        usb_standard_configuration_descriptor_t *d
-            = (usb_standard_configuration_descriptor_t *) descriptor;
+        usb_standard_configuration_descriptor_t *d =
+            (usb_standard_configuration_descriptor_t *) descriptor;
         if (descriptor_length < sizeof(*d)) {
                 return;
@@ -194 +194 @@
     const uint8_t *descriptor, size_t descriptor_length)
 {
-        usb_standard_interface_descriptor_t *d
-            = (usb_standard_interface_descriptor_t *) descriptor;
+        usb_standard_interface_descriptor_t *d =
+            (usb_standard_interface_descriptor_t *) descriptor;
         if (descriptor_length < sizeof(*d)) {
                 return;
@@ -205 +205 @@
         PRINTLINE("bAlternateSetting = %d", d->alternate_setting);
         PRINTLINE("bNumEndpoints = %d", d->endpoint_count);
-        PRINTLINE("bInterfaceClass = %s", d->interface_class == 0
-            ? "reserved (0)" : usb_str_class(d->interface_class));
+        PRINTLINE("bInterfaceClass = %s", d->interface_class == 0 ?
+            "reserved (0)" : usb_str_class(d->interface_class));
         PRINTLINE("bInterfaceSubClass = %d", d->interface_subclass);
         PRINTLINE("bInterfaceProtocol = %d", d->interface_protocol);
@@ -222 +222 @@
     const uint8_t *descriptor, size_t descriptor_length)
 {
-        usb_standard_endpoint_descriptor_t *d
-           = (usb_standard_endpoint_descriptor_t *) descriptor;
+        usb_standard_endpoint_descriptor_t *d =
+            (usb_standard_endpoint_descriptor_t *) descriptor;
         if (descriptor_length < sizeof(*d)) {
                 return;
@@ -229 +229 @@
 
         int endpoint = d->endpoint_address & 15;
-        usb_direction_t direction = d->endpoint_address & 128
-            ? USB_DIRECTION_IN : USB_DIRECTION_OUT;
+        usb_direction_t direction = d->endpoint_address & 128 ?
+            USB_DIRECTION_IN : USB_DIRECTION_OUT;
         usb_transfer_type_t transfer_type = d->attributes & 3;
 
@@ -248 +248 @@
     const uint8_t *descriptor, size_t descriptor_length)
 {
-        usb_superspeed_endpoint_companion_descriptor_t *d
-           = (usb_superspeed_endpoint_companion_descriptor_t *) descriptor;
+        usb_superspeed_endpoint_companion_descriptor_t *d =
+            (usb_superspeed_endpoint_companion_descriptor_t *) descriptor;
         if (descriptor_length < sizeof(*d)) {
                 return;
@@ -265 +265 @@
     const uint8_t *descriptor, size_t descriptor_length)
 {
-        usb_standard_hid_descriptor_t *d
-            = (usb_standard_hid_descriptor_t *) descriptor;
+        usb_standard_hid_descriptor_t *d =
+            (usb_standard_hid_descriptor_t *) descriptor;
         if (descriptor_length < sizeof(*d)) {
                 return;
@@ -282 +282 @@
         /* Print info about report descriptors. */
         size_t i;
-        size_t count = (descriptor_length - sizeof(*d))
-            / sizeof(usb_standard_hid_class_descriptor_info_t);
-        usb_standard_hid_class_descriptor_info_t *d2
-            = (usb_standard_hid_class_descriptor_info_t *)
+        size_t count = (descriptor_length - sizeof(*d)) /
+            sizeof(usb_standard_hid_class_descriptor_info_t);
+        usb_standard_hid_class_descriptor_info_t *d2 =
+            (usb_standard_hid_class_descriptor_info_t *)
             (descriptor + sizeof(*d));
         for (i = 0; i < count; i++, d2++) {
@@ -308 +308 @@
             d->characteristics_reserved, d->characteristics,
             (d->characteristics & HUB_CHAR_NO_POWER_SWITCH_FLAG) ?
-                "No Power Switching" :
-                ((d->characteristics & HUB_CHAR_POWER_PER_PORT_FLAG) ?
-                    "Per-Port Switching" : "Ganged Power Switching"),
+            "No Power Switching" :
+            ((d->characteristics & HUB_CHAR_POWER_PER_PORT_FLAG) ?
+            "Per-Port Switching" : "Ganged Power Switching"),
             (d->characteristics & HUB_CHAR_COMPOUND_DEVICE) ?
-                "Compound Device;" : "",
+            "Compound Device;" : "",
             (d->characteristics & HUB_CHAR_NO_OC_FLAG) ?
-                "No OC Protection" :
-                    ((d->characteristics & HUB_CHAR_OC_PER_PORT_FLAG) ?
-                        "Individual Port OC Protection" :
-                            "Global OC Protection")
-        );
+            "No OC Protection" :
+            ((d->characteristics & HUB_CHAR_OC_PER_PORT_FLAG) ?
+            "Individual Port OC Protection" :
+            "Global OC Protection"));
         PRINTLINE("bPwrOn2PwrGood = %d (%d ms)",
             d->power_good_time, d->power_good_time * 2);
@@ -327 +326 @@
         const uint8_t *powered_mask = descriptor + sizeof(*d) + port_bytes;
 
-        if (port_bytes == 0
-            || port_bytes > (((d->port_count / (unsigned)8) + 1) * 2)) {
+        if (port_bytes == 0 ||
+            port_bytes > (((d->port_count / (unsigned)8) + 1) * 2)) {
                 PRINTLINE("::CORRUPTED DESCRIPTOR:: (%zu bytes remain)",
                     port_bytes * 2);