Changeset a35b458 in mainline for uspace/app/mkbd/main.c

Timestamp:

2018-03-02T20:10:49Z (7 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.

File:

• uspace/app/mkbd/main.c (modified) (20 diffs)

uspace/app/mkbd/main.c

@@ -66 +66 @@
         if (*report == NULL)
                 return ENOMEM;
-        
+
         errno_t rc = usb_hid_report_init(*report);
         if (rc != EOK) {
@@ -73 +73 @@
                 return rc;
         }
-        
+
         /* Get the report descriptor length from the device */
         size_t report_desc_size;
@@ -83 +83 @@
                 return rc;
         }
-        
+
         if (report_desc_size == 0) {
                 usb_hid_report_deinit(*report);
@@ -90 +90 @@
                 return EINVAL;
         }
-        
+
         uint8_t *desc = (uint8_t *) malloc(report_desc_size);
         if (desc == NULL) {
@@ -97 +97 @@
                 return ENOMEM;
         }
-        
+
         /* Get the report descriptor from the device */
         size_t actual_size;
@@ -108 +108 @@
                 return rc;
         }
-        
+
         if (actual_size != report_desc_size) {
                 usb_hid_report_deinit(*report);
@@ -116 +116 @@
                 return EINVAL;
         }
-        
+
         /* Initialize the report parser */
-        
+
         rc = usb_hid_parse_report_descriptor(*report, desc, report_desc_size);
         free(desc);
-        
+
         return rc;
 }
@@ -129 +129 @@
         assert(buffer != NULL);
         assert(report != NULL);
-        
+
         uint8_t report_id;
         errno_t rc = usb_hid_parse_report(report, buffer, size, &report_id);
         if (rc != EOK)
                 return;
-        
+
         usb_hid_report_path_t *path = usb_hid_report_path();
         if (path == NULL) {
                 return;
         }
-        
+
         usb_hid_report_path_append_item(path, USB_HIDUT_PAGE_CONSUMER, 0);
-        
+
         usb_hid_report_path_set_report_id(path, report_id);
 
@@ -148 +148 @@
             | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY,
             USB_HID_REPORT_TYPE_INPUT);
-        
+
         while (field != NULL) {
                 if (field->value != 0) {
@@ -155 +155 @@
                         printf("Pressed key: %s\n", key_str);
                 }
-                
+
                 field = usb_hid_report_get_sibling(
                     report, field, path, USB_HID_PATH_COMPARE_END
@@ -161 +161 @@
                     USB_HID_REPORT_TYPE_INPUT);
         }
-        
+
         usb_hid_report_path_free(path);
 }
@@ -208 +208 @@
 {
         int act_event = -1;
-        
+
         if (argc <= 1) {
                 print_usage(argv[0]);
                 return -1;
         }
-        
+
         char *devpath = argv[1];
-        
+
         devman_handle_t dev_handle = 0;
-        
+
         errno_t rc = usb_resolve_device_handle(devpath, &dev_handle);
         if (rc != EOK) {
@@ -224 +224 @@
                 return rc;
         }
-        
+
         async_sess_t *sess = devman_device_connect(dev_handle, 0);
         if (!sess) {
@@ -231 +231 @@
                 return errno;
         }
-        
+
         dev_sess = sess;
-        
+
         char path[MAX_PATH_LENGTH];
         rc = devman_fun_get_path(dev_handle, path, MAX_PATH_LENGTH);
@@ -241 +241 @@
                 return ENOMEM;
         }
-        
+
         printf("Device path: %s\n", path);
-        
-        
+
+
         usb_hid_report_t *report = NULL;
         rc = initialize_report_parser(dev_sess, &report);
@@ -252 +252 @@
                 return rc;
         }
-        
+
         assert(report != NULL);
-        
+
         size_t size;
         rc = usbhid_dev_get_event_length(dev_sess, &size);
@@ -261 +261 @@
                 return rc;
         }
-        
+
         uint8_t *event = (uint8_t *)malloc(size);
         if (event == NULL) {
@@ -268 +268 @@
                 return ENOMEM;
         }
-        
+
         fid_t quit_fibril = fibril_create(wait_for_quit_fibril, NULL);
         if (quit_fibril == 0) {
@@ -278 +278 @@
         size_t actual_size;
         int event_nr;
-        
+
         while (true) {
                 /** @todo Try blocking call. */
@@ -289 +289 @@
                         break;
                 }
-                
+
                 if (event_nr > act_event) {
                         print_key(event, size, report);
                         act_event = event_nr;
                 }
-                
+
                 async_usleep(10000);
         }
-        
+
         return 0;
 }