Changeset a35b458 in mainline for uspace/drv/hid/usbhid

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.

Location:

uspace/drv/hid/usbhid

Files:

• blink1/blink1.c (modified) (9 diffs)
• blink1/blink1.h (modified) (1 diff)
• kbd/kbddev.h (modified) (3 diffs)
• mouse/mousedev.h (modified) (1 diff)
• multimedia/keymap.c (modified) (1 diff)
• subdrivers.h (modified) (1 diff)

uspace/drv/hid/usbhid/blink1/blink1.c

@@ -67 +67 @@
                 return EINVAL;
         }
-        
+
         blink1_report_t report;
-        
+
         report.id = BLINK1_REPORT_ID;
         report.command = BLINK1_COMMAND_SET;
@@ -78 +78 @@
         report.arg4 = 0;
         report.arg5 = 0;
-        
+
         return usbhid_req_set_report(
             usb_device_get_default_pipe(blink1_dev->hid_dev->usb_dev),
@@ -100 +100 @@
                 return EINVAL;
         }
-        
+
         /* Create the exposed function. */
         ddf_fun_t *fun = usb_device_ddf_fun_create(hid_dev->usb_dev,
@@ -109 +109 @@
                 return ENOMEM;
         }
-        
+
         usb_blink1_t *blink1_dev = (usb_blink1_t *)
             ddf_fun_data_alloc(fun, sizeof(usb_blink1_t));
@@ -118 +118 @@
                 return ENOMEM;
         }
-        
+
         ddf_fun_set_ops(fun, &blink1_ops);
-        
+
         errno_t rc = ddf_fun_bind(fun);
         if (rc != EOK) {
@@ -128 +128 @@
                 return rc;
         }
-        
+
         rc = ddf_fun_add_to_category(fun, HID_BLINK1_CATEGORY);
         if (rc != EOK) {
                 usb_log_error("Could not add DDF function to category %s: %s.",
                     HID_BLINK1_CATEGORY, str_error(rc));
-                
+
                 rc = ddf_fun_unbind(fun);
                 if (rc != EOK) {
@@ -140 +140 @@
                         return rc;
                 }
-                
+
                 ddf_fun_destroy(fun);
                 return rc;
         }
-        
+
         blink1_dev->fun = fun;
         blink1_dev->hid_dev = hid_dev;
         *data = blink1_dev;
-        
+
         return EOK;
 }
@@ -156 +156 @@
         if (data == NULL)
                 return;
-        
+
         usb_blink1_t *blink1_dev = (usb_blink1_t *) data;
-        
+
         errno_t rc = ddf_fun_unbind(blink1_dev->fun);
         if (rc != EOK) {
@@ -165 +165 @@
                 return;
         }
-        
+
         ddf_fun_destroy(blink1_dev->fun);
 }

uspace/drv/hid/usbhid/blink1/blink1.h

@@ -44 +44 @@
         /** DDF blink(1) function */
         ddf_fun_t *fun;
-        
+
         /** USB HID device */
         usb_hid_dev_t *hid_dev;

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

@@ -63 +63 @@
         /** Link to HID device structure */
         usb_hid_dev_t *hid_dev;
-        
+
         /** Previously pressed keys (not translated to key codes). */
         int32_t *keys_old;
@@ -72 +72 @@
         /** Currently pressed modifiers (bitmap). */
         uint8_t modifiers;
-        
+
         /** Currently active modifiers including locks. Sent to the console. */
         unsigned int mods;
-        
+
         /** Currently active lock keys. */
         unsigned int lock_keys;
-        
+
         /** IPC session to client (for sending key events). */
         async_sess_t *client_sess;
-        
+
         /** Information for auto-repeat of keys. */
         usb_kbd_repeat_t repeat;
-        
+
         /** Mutex for accessing the information about auto-repeat. */
         fibril_mutex_t repeat_mtx;
-        
+
         uint8_t *output_buffer;
-        
+
         size_t output_size;
-        
+
         size_t led_output_size;
-        
+
         usb_hid_report_path_t *led_path;
-        
+
         int32_t *led_data;
-        
+
         /** State of the structure (for checking before use).
          *
@@ -105 +105 @@
          */
         int initialized;
-        
+
         /** DDF function */
         ddf_fun_t *fun;

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

@@ -45 +45 @@
         /** IPC session to consumer. */
         async_sess_t *mouse_sess;
-        
+
         /** Mouse buttons statuses. */
         int32_t *buttons;
         size_t buttons_count;
-        
+
         /** DDF mouse function */
         ddf_fun_t *mouse_fun;

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

@@ -86 +86 @@
         /*! @todo What if the usage is not in the table? */
         key = map[usage];
-        
+
         return key;
 }

uspace/drv/hid/usbhid/subdrivers.h

@@ -61 +61 @@
          */
         const usb_hid_subdriver_usage_t *usage_path;
-        
+
         /** Report ID for which the path should apply. */
         int report_id;
-        
+
         /** Compare type for the usage path. */
         int compare;
-        
+
         /** Vendor ID (set to -1 if not specified). */
         int vendor_id;
-        
+
         /** Product ID (set to -1 if not specified). */
         int product_id;
-        
+
         /** Subdriver for controlling this device. */
         const usb_hid_subdriver_t subdriver;