Changeset 18b6a88 in mainline for uspace/drv/hid

Timestamp:

2018-04-15T09:35:04Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c1f44ca

Parents:

8ebe212

Message:

More ccheck fixes, sometimes with manual intervention.

Location:

uspace/drv/hid/usbhid

Files:

• kbd/kbddev.c (modified) (9 diffs)
• mouse/mousedev.c (modified) (4 diffs)
• multimedia/multimedia.c (modified) (2 diffs)

uspace/drv/hid/usbhid/kbd/kbddev.c

@@ -191 +191 @@
                 } else {
                         usb_log_error("%s: console session already set",
-                           __FUNCTION__);
+                            __FUNCTION__);
                         async_answer_0(icall_handle, ELIMIT);
                 }
                 break;
         default:
-                        usb_log_error("%s: Unknown method: %d.",
-                            __FUNCTION__, (int) method);
-                        async_answer_0(icall_handle, EINVAL);
-                        break;
+                usb_log_error("%s: Unknown method: %d.",
+                    __FUNCTION__, (int) method);
+                async_answer_0(icall_handle, EINVAL);
+                break;
         }
 
@@ -236 +236 @@
         while (field != NULL) {
 
-                if ((field->usage == USB_HID_LED_NUM_LOCK)
-                    && (kbd_dev->mods & KM_NUM_LOCK)){
+                if ((field->usage == USB_HID_LED_NUM_LOCK) &&
+                    (kbd_dev->mods & KM_NUM_LOCK)) {
                         field->value = 1;
                 }
 
-                if ((field->usage == USB_HID_LED_CAPS_LOCK)
-                    && (kbd_dev->mods & KM_CAPS_LOCK)){
+                if ((field->usage == USB_HID_LED_CAPS_LOCK) &&
+                    (kbd_dev->mods & KM_CAPS_LOCK)) {
                         field->value = 1;
                 }
 
-                if ((field->usage == USB_HID_LED_SCROLL_LOCK)
-                    && (kbd_dev->mods & KM_SCROLL_LOCK)){
+                if ((field->usage == USB_HID_LED_SCROLL_LOCK) &&
+                    (kbd_dev->mods & KM_SCROLL_LOCK)) {
                         field->value = 1;
                 }
@@ -253 +253 @@
                 field = usb_hid_report_get_sibling(
                     &hid_dev->report, field, kbd_dev->led_path,
-                USB_HID_PATH_COMPARE_END | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY,
+                    USB_HID_PATH_COMPARE_END | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY,
                     USB_HID_REPORT_TYPE_OUTPUT);
         }
@@ -269 +269 @@
         usb_log_debug("Output report buffer: %s",
             usb_debug_str_buffer(kbd_dev->output_buffer, kbd_dev->output_size,
-                0));
+            0));
 
         rc = usbhid_req_set_report(
@@ -308 +308 @@
 static inline int usb_kbd_is_lock(unsigned int key_code)
 {
-        return (key_code == KC_NUM_LOCK
-            || key_code == KC_SCROLL_LOCK
-            || key_code == KC_CAPS_LOCK);
+        return (key_code == KC_NUM_LOCK ||
+            key_code == KC_SCROLL_LOCK ||
+            key_code == KC_CAPS_LOCK);
 }
 
@@ -437 +437 @@
 
         errno_t ret =
-           usb_hid_report_path_append_item(path, USB_HIDUT_PAGE_KEYBOARD, 0);
+            usb_hid_report_path_append_item(path, USB_HIDUT_PAGE_KEYBOARD, 0);
         if (ret != EOK) {
                 usb_log_error("Failed to append to hid/kbd report path.");
@@ -461 +461 @@
                 if (field->value != 0) {
                         kbd_dev->keys[i] = field->usage;
-                }
-                else {
+                } else {
                         kbd_dev->keys[i] = 0;
                 }
@@ -469 +468 @@
                 ++i;
                 field = usb_hid_report_get_sibling(
-                    &hid_dev->report, field, path, USB_HID_PATH_COMPARE_END
-                        | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY,
+                    &hid_dev->report, field, path, USB_HID_PATH_COMPARE_END |
+                    USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY,
                     USB_HID_REPORT_TYPE_INPUT);
         }
@@ -742 +741 @@
         // FIXME - the fibril_mutex_is_locked may not cause
         // fibril scheduling
-        while (fibril_mutex_is_locked(&kbd_dev->repeat_mtx)) {}
+        while (fibril_mutex_is_locked(&kbd_dev->repeat_mtx)) {
+        }
 
         /* Free all buffers. */

uspace/drv/hid/usbhid/mouse/mousedev.c

@@ -184 +184 @@
             hid_dev->report_id, &hid_dev->report,
             USB_HIDUT_USAGE_GENERIC_DESKTOP_Y);
-        const usb_hid_report_field_t *wheel= get_mouse_axis_move_field(
+        const usb_hid_report_field_t *wheel = get_mouse_axis_move_field(
             hid_dev->report_id, &hid_dev->report,
             USB_HIDUT_USAGE_GENERIC_DESKTOP_WHEEL);
@@ -232 +232 @@
         }
         errno_t ret =
-           usb_hid_report_path_append_item(path, USB_HIDUT_PAGE_BUTTON, 0);
+            usb_hid_report_path_append_item(path, USB_HIDUT_PAGE_BUTTON, 0);
         if (ret != EOK) {
                 usb_hid_report_path_free(path);
@@ -241 +241 @@
 
         usb_hid_report_field_t *field = usb_hid_report_get_sibling(
-            &hid_dev->report, NULL, path, USB_HID_PATH_COMPARE_END
-            | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY, USB_HID_REPORT_TYPE_INPUT);
+            &hid_dev->report, NULL, path, USB_HID_PATH_COMPARE_END |
+            USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY, USB_HID_REPORT_TYPE_INPUT);
 
         while (field != NULL) {
@@ -263 +263 @@
 
                 field = usb_hid_report_get_sibling(
-                    &hid_dev->report, field, path, USB_HID_PATH_COMPARE_END
-                    | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY,
+                    &hid_dev->report, field, path, USB_HID_PATH_COMPARE_END |
+                    USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY,
                     USB_HID_REPORT_TYPE_INPUT);
         }

uspace/drv/hid/usbhid/multimedia/multimedia.c

@@ -260 +260 @@
 
         usb_hid_report_field_t *field = usb_hid_report_get_sibling(
-            &hid_dev->report, NULL, path, USB_HID_PATH_COMPARE_END
-            | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY,
+            &hid_dev->report, NULL, path, USB_HID_PATH_COMPARE_END |
+            USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY,
             USB_HID_REPORT_TYPE_INPUT);
 
@@ -279 +279 @@
 
                 field = usb_hid_report_get_sibling(
-                    &hid_dev->report, field, path, USB_HID_PATH_COMPARE_END
-                    | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY,
+                    &hid_dev->report, field, path, USB_HID_PATH_COMPARE_END |
+                    USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY,
                     USB_HID_REPORT_TYPE_INPUT);
         }