Changeset 3bacee1 in mainline for uspace/app/vuhid

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.

Location:

uspace/app/vuhid

Files:

• device.c (modified) (6 diffs)
• stdreq.c (modified) (1 diff)

uspace/app/vuhid/device.c

@@ -129 +129 @@
 
         /* Check that we have not run out of available endpoints. */
-        if ((iface->in_data_size > 0)
-            && (hid_data->in_endpoint_first_free >= VUHID_ENDPOINT_MAX)) {
+        if ((iface->in_data_size > 0) &&
+            (hid_data->in_endpoint_first_free >= VUHID_ENDPOINT_MAX)) {
                 return ELIMIT;
         }
-        if ((iface->out_data_size > 0)
-            && (hid_data->out_endpoint_first_free >= VUHID_ENDPOINT_MAX)) {
+        if ((iface->out_data_size > 0) &&
+            (hid_data->out_endpoint_first_free >= VUHID_ENDPOINT_MAX)) {
                 return ELIMIT;
         }
@@ -192 +192 @@
         descr_iface->length = sizeof(usb_standard_interface_descriptor_t);
         descr_iface->descriptor_type = USB_DESCTYPE_INTERFACE;
-        descr_iface->interface_number
-            = dev->descriptors->configuration->descriptor->interface_count;
+        descr_iface->interface_number =
+            dev->descriptors->configuration->descriptor->interface_count;
         descr_iface->alternate_setting = 0;
         descr_iface->endpoint_count = ep_count;
@@ -230 +230 @@
                 descr_ep_in->length = sizeof(usb_standard_endpoint_descriptor_t);
                 descr_ep_in->descriptor_type = USB_DESCTYPE_ENDPOINT;
-                descr_ep_in->endpoint_address
-                    = 0x80 | hid_data->in_endpoint_first_free;
+                descr_ep_in->endpoint_address =
+                    0x80 | hid_data->in_endpoint_first_free;
                 descr_ep_in->attributes = 3;
                 descr_ep_in->max_packet_size = iface->in_data_size;
@@ -246 +246 @@
                 descr_ep_out->length = sizeof(usb_standard_endpoint_descriptor_t);
                 descr_ep_out->descriptor_type = USB_DESCTYPE_ENDPOINT;
-                descr_ep_out->endpoint_address
-                    = 0x00 | hid_data->out_endpoint_first_free;
+                descr_ep_out->endpoint_address =
+                    0x00 | hid_data->out_endpoint_first_free;
                 descr_ep_out->attributes = 3;
                 descr_ep_out->max_packet_size = iface->out_data_size;
@@ -256 +256 @@
         usbvirt_device_configuration_extras_t *extra_descriptors;
         extra_descriptors = realloc(dev->descriptors->configuration->extra,
-            sizeof(usbvirt_device_configuration_extras_t)
-            * (dev->descriptors->configuration->extra_count + descr_count));
+            sizeof(usbvirt_device_configuration_extras_t) *
+            (dev->descriptors->configuration->extra_count + descr_count));
         if (extra_descriptors == NULL) {
                 rc = ENOMEM;
@@ -300 +300 @@
          */
         if (iface->in_data_size > 0) {
-                hid_data->in_endpoints_mapping[hid_data->in_endpoint_first_free]
-                    = iface;
-                dev->ops->data_in[hid_data->in_endpoint_first_free]
-                    = on_data_from_device;
+                hid_data->in_endpoints_mapping[hid_data->in_endpoint_first_free] =
+                    iface;
+                dev->ops->data_in[hid_data->in_endpoint_first_free] =
+                    on_data_from_device;
                 hid_data->in_endpoint_first_free++;
         }
         if (iface->out_data_size > 0) {
-                hid_data->out_endpoints_mapping[hid_data->out_endpoint_first_free]
-                    = iface;
-                dev->ops->data_out[hid_data->out_endpoint_first_free]
-                    = on_data_to_device;
+                hid_data->out_endpoints_mapping[hid_data->out_endpoint_first_free] =
+                    iface;
+                dev->ops->data_out[hid_data->out_endpoint_first_free] =
+                    on_data_to_device;
                 hid_data->out_endpoint_first_free++;
         }
 
-        hid_data->interface_mapping[
-            dev->descriptors->configuration->descriptor->interface_count]
-            = iface;
+        hid_data->interface_mapping[dev->descriptors->configuration->descriptor->interface_count] =
+            iface;
 
         dev->descriptors->configuration->descriptor->interface_count++;
-        dev->descriptors->configuration->descriptor->total_length
-            += total_descr_size;
+        dev->descriptors->configuration->descriptor->total_length +=
+            total_descr_size;
 
         hid_data->iface_count++;

uspace/app/vuhid/stdreq.c

@@ -50 +50 @@
 
         if (setup_packet->value_high == USB_DESCTYPE_HID_REPORT) {
-                vuhid_interface_t *iface
-                    = vuhid->interface_mapping[setup_packet->index];
+                vuhid_interface_t *iface =
+                    vuhid->interface_mapping[setup_packet->index];
                 if (iface == NULL) {
                         return EFORWARD;