Changeset 3bacee1 in mainline for uspace/drv/hid

Timestamp:

2018-04-12T16:27:17Z (8 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/drv/hid

Files:

• ps2mouse/ps2mouse.c (modified) (3 diffs)
• usbhid/usbhid.c (modified) (6 diffs)

uspace/drv/hid/ps2mouse/ps2mouse.c

@@ -165 +165 @@
 
         /* Probe IntelliMouse extensions. */
-        errno_t (*polling_f)(void*) = polling_ps2;
+        errno_t (*polling_f)(void *) = polling_ps2;
         if (probe_intellimouse(mouse, false) == EOK) {
                 ddf_msg(LVL_NOTE, "Enabled IntelliMouse extensions");
@@ -253 +253 @@
         errno_t rc;
 
-        bool buttons[PS2_BUTTON_COUNT] = {};
+        bool buttons[PS2_BUTTON_COUNT] = { };
         while (true) {
-                uint8_t packet[PS2_BUFSIZE] = {};
+                uint8_t packet[PS2_BUFSIZE] = { };
                 rc = ps2_mouse_read_packet(mouse, packet, PS2_BUFSIZE);
                 if (rc != EOK)
@@ -305 +305 @@
         errno_t rc;
 
-        bool buttons[INTELLIMOUSE_BUTTON_COUNT] = {};
+        bool buttons[INTELLIMOUSE_BUTTON_COUNT] = { };
         while (true) {
-                uint8_t packet[INTELLIMOUSE_BUFSIZE] = {};
+                uint8_t packet[INTELLIMOUSE_BUFSIZE] = { };
                 rc = ps2_mouse_read_packet(mouse, packet, INTELLIMOUSE_BUFSIZE);
                 if (rc != EOK)

uspace/drv/hid/usbhid/usbhid.c

@@ -123 +123 @@
             &usb_device_descriptors(hid_dev->usb_dev)->device;
 
-        return (d->vendor_id == mapping->vendor_id)
-            && (d->product_id == mapping->product_id);
+        return (d->vendor_id == mapping->vendor_id) &&
+            (d->product_id == mapping->product_id);
 }
 
@@ -139 +139 @@
         }
 
-        for (int i = 0; mapping->usage_path[i].usage != 0
-            || mapping->usage_path[i].usage_page != 0; ++i) {
+        for (int i = 0; mapping->usage_path[i].usage != 0 ||
+            mapping->usage_path[i].usage_page != 0; ++i) {
                 if (usb_hid_report_path_append_item(usage_path,
                     mapping->usage_path[i].usage_page,
@@ -159 +159 @@
                 if (report_id != 0) {
                         usb_hid_report_path_set_report_id(usage_path,
-                                report_id);
+                            report_id);
                 }
 
                 const usb_hid_report_field_t *field =
                     usb_hid_report_get_sibling(
-                        &hid_dev->report, NULL, usage_path, mapping->compare,
-                        USB_HID_REPORT_TYPE_INPUT);
+                    &hid_dev->report, NULL, usage_path, mapping->compare,
+                    USB_HID_REPORT_TYPE_INPUT);
 
                 usb_log_debug("Field: %p", field);
@@ -275 +275 @@
         static const struct {
                 const usb_endpoint_description_t *desc;
-                const char* description;
+                const char *description;
         } endpoints[] = {
-                {&usb_hid_kbd_poll_endpoint_description, "Keyboard endpoint"},
-                {&usb_hid_mouse_poll_endpoint_description, "Mouse endpoint"},
-                {&usb_hid_generic_poll_endpoint_description, "Generic HID endpoint"},
+                { &usb_hid_kbd_poll_endpoint_description, "Keyboard endpoint" },
+                { &usb_hid_mouse_poll_endpoint_description, "Mouse endpoint" },
+                { &usb_hid_generic_poll_endpoint_description, "Generic HID endpoint" },
         };
 
@@ -305 +305 @@
                 const size_t size =
                     usb_hid_report_byte_size(&hid_dev->report, report_id,
-                        USB_HID_REPORT_TYPE_INPUT);
+                    USB_HID_REPORT_TYPE_INPUT);
                 usb_log_debug("Report ID: %u, size: %zu", report_id, size);
                 max_size = (size > max_size) ? size : max_size;
@@ -492 +492 @@
         for (unsigned i = 0; i < hid_dev->subdriver_count; ++i) {
                 if (hid_dev->subdrivers[i].init != NULL) {
-                        usb_log_debug("Initializing subdriver %d.",i);
+                        usb_log_debug("Initializing subdriver %d.", i);
                         const errno_t pret = hid_dev->subdrivers[i].init(hid_dev,
                             &hid_dev->subdrivers[i].data);