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

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.

File:

• uspace/drv/hid/xtkbd/xtkbd.c (modified) (20 diffs)

uspace/drv/hid/xtkbd/xtkbd.c

@@ -47 +47 @@
 static const unsigned int scanmap_simple[] = {
         [0x29] = KC_BACKTICK,
-        
+
         [0x02] = KC_1,
         [0x03] = KC_2,
@@ -58 +58 @@
         [0x0a] = KC_9,
         [0x0b] = KC_0,
-        
+
         [0x0c] = KC_MINUS,
         [0x0d] = KC_EQUALS,
         [0x0e] = KC_BACKSPACE,
-        
+
         [0x0f] = KC_TAB,
-        
+
         [0x10] = KC_Q,
         [0x11] = KC_W,
@@ -75 +75 @@
         [0x18] = KC_O,
         [0x19] = KC_P,
-        
+
         [0x1a] = KC_LBRACKET,
         [0x1b] = KC_RBRACKET,
-        
+
         [0x3a] = KC_CAPS_LOCK,
-        
+
         [0x1e] = KC_A,
         [0x1f] = KC_S,
@@ -90 +90 @@
         [0x25] = KC_K,
         [0x26] = KC_L,
-        
+
         [0x27] = KC_SEMICOLON,
         [0x28] = KC_QUOTE,
         [0x2b] = KC_BACKSLASH,
-        
+
         [0x2a] = KC_LSHIFT,
-        
+
         [0x2c] = KC_Z,
         [0x2d] = KC_X,
@@ -104 +104 @@
         [0x31] = KC_N,
         [0x32] = KC_M,
-        
+
         [0x33] = KC_COMMA,
         [0x34] = KC_PERIOD,
         [0x35] = KC_SLASH,
-        
+
         [0x36] = KC_RSHIFT,
-        
+
         [0x1d] = KC_LCTRL,
         [0x38] = KC_LALT,
         [0x39] = KC_SPACE,
-        
+
         [0x01] = KC_ESCAPE,
-        
+
         [0x3b] = KC_F1,
         [0x3c] = KC_F2,
@@ -124 +124 @@
         [0x40] = KC_F6,
         [0x41] = KC_F7,
-        
+
         [0x42] = KC_F8,
         [0x43] = KC_F9,
         [0x44] = KC_F10,
-        
+
         [0x57] = KC_F11,
         [0x58] = KC_F12,
-        
+
         [0x46] = KC_SCROLL_LOCK,
-        
+
         [0x1c] = KC_ENTER,
-        
+
         [0x45] = KC_NUM_LOCK,
         [0x37] = KC_NTIMES,
@@ -162 +162 @@
         [0x38] = KC_RALT,
         [0x1d] = KC_RCTRL,
-        
+
         [0x37] = KC_SYSREQ,
-        
+
         [0x52] = KC_INSERT,
         [0x47] = KC_HOME,
         [0x49] = KC_PAGE_UP,
-        
+
         [0x53] = KC_DELETE,
         [0x4f] = KC_END,
         [0x51] = KC_PAGE_DOWN,
-        
+
         [0x48] = KC_UP,
         [0x4b] = KC_LEFT,
         [0x50] = KC_DOWN,
         [0x4d] = KC_RIGHT,
-        
+
         [0x35] = KC_NSLASH,
         [0x1c] = KC_NENTER
@@ -210 +210 @@
         size_t nread;
         errno_t rc;
-        
+
         while (true) {
                 const unsigned int *map = scanmap_simple;
                 size_t map_size = sizeof(scanmap_simple) / sizeof(unsigned int);
-                
+
                 uint8_t code = 0;
                 rc = chardev_read(kbd->chardev, &code, 1, &nread);
                 if (rc != EOK)
                         return EIO;
-                
+
                 /* Ignore AT command reply */
                 if ((code == KBD_ACK) || (code == KBD_RESEND))
                         continue;
-                
+
                 /* Extended set */
                 if (code == KBD_SCANCODE_SET_EXTENDED) {
                         map = scanmap_e0;
                         map_size = sizeof(scanmap_e0) / sizeof(unsigned int);
-                        
-                        rc = chardev_read(kbd->chardev, &code, 1, &nread);
-                        if (rc != EOK)
-                                return EIO;
-                        
+
+                        rc = chardev_read(kbd->chardev, &code, 1, &nread);
+                        if (rc != EOK)
+                                return EIO;
+
                         /* Handle really special keys */
-                        
+
                         if (code == 0x2a) {  /* Print Screen */
                                 rc = chardev_read(kbd->chardev, &code, 1, &nread);
                                 if (rc != EOK)
                                         return EIO;
-                                
+
                                 if (code != 0xe0)
                                         continue;
-                                
+
                                 rc = chardev_read(kbd->chardev, &code, 1, &nread);
                                 if (rc != EOK)
                                         return EIO;
-                                
+
                                 if (code == 0x37)
                                         push_event(kbd->client_sess, KEY_PRESS, KC_PRTSCR);
-                                
+
                                 continue;
                         }
-                        
+
                         if (code == 0x46) {  /* Break */
                                 rc = chardev_read(kbd->chardev, &code, 1, &nread);
                                 if (rc != EOK)
                                         return EIO;
-                                
+
                                 if (code != 0xe0)
                                         continue;
-                                
+
                                 rc = chardev_read(kbd->chardev, &code, 1, &nread);
                                 if (rc != EOK)
                                         return EIO;
-                                
+
                                 if (code == 0xc6)
                                         push_event(kbd->client_sess, KEY_PRESS, KC_BREAK);
-                                
+
                                 continue;
                         }
                 }
-                
+
                 /* Extended special set */
                 if (code == KBD_SCANCODE_SET_EXTENDED_SPECIAL) {
@@ -277 +277 @@
                         if (rc != EOK)
                                 return EIO;
-                        
+
                         if (code != 0x1d)
                                 continue;
-                        
-                        rc = chardev_read(kbd->chardev, &code, 1, &nread);
-                        if (rc != EOK)
-                                return EIO;
-                        
+
+                        rc = chardev_read(kbd->chardev, &code, 1, &nread);
+                        if (rc != EOK)
+                                return EIO;
+
                         if (code != 0x45)
                                 continue;
-                        
-                        rc = chardev_read(kbd->chardev, &code, 1, &nread);
-                        if (rc != EOK)
-                                return EIO;
-                        
+
+                        rc = chardev_read(kbd->chardev, &code, 1, &nread);
+                        if (rc != EOK)
+                                return EIO;
+
                         if (code != 0xe1)
                                 continue;
-                        
-                        rc = chardev_read(kbd->chardev, &code, 1, &nread);
-                        if (rc != EOK)
-                                return EIO;
-                        
+
+                        rc = chardev_read(kbd->chardev, &code, 1, &nread);
+                        if (rc != EOK)
+                                return EIO;
+
                         if (code != 0x9d)
                                 continue;
-                        
-                        rc = chardev_read(kbd->chardev, &code, 1, &nread);
-                        if (rc != EOK)
-                                return EIO;
-                        
+
+                        rc = chardev_read(kbd->chardev, &code, 1, &nread);
+                        if (rc != EOK)
+                                return EIO;
+
                         if (code == 0xc5)
                                 push_event(kbd->client_sess, KEY_PRESS, KC_PAUSE);
-                        
+
                         continue;
                 }
-                
+
                 /* Bit 7 indicates press/release */
                 const kbd_event_type_t type =
                     (code & 0x80) ? KEY_RELEASE : KEY_PRESS;
                 code &= ~0x80;
-                
+
                 const unsigned int key = (code < map_size) ? map[code] : 0;
-                
+
                 if (key != 0)
                         push_event(kbd->client_sess, type, key);
@@ -351 +351 @@
                     ((mods & KM_SCROLL_LOCK) ? LI_SCROLL : 0);
                 uint8_t cmds[] = { KBD_CMD_SET_LEDS, status };
-                
+
                 size_t nwr;
                 errno_t rc = chardev_write(kbd->chardev, &cmds[0], 1, &nwr);
@@ -370 +370 @@
                 async_sess_t *sess =
                     async_callback_receive_start(EXCHANGE_SERIALIZE, icall);
-                
+
                 /* Probably ENOMEM error, try again. */
                 if (sess == NULL) {
@@ -378 +378 @@
                         break;
                 }
-                
+
                 if (kbd->client_sess == NULL) {
                         kbd->client_sess = sess;
@@ -387 +387 @@
                         async_answer_0(icallid, ELIMIT);
                 }
-                
+
                 break;
         }
@@ -415 +415 @@
         bool bound = false;
         errno_t rc;
-        
+
         kbd->client_sess = NULL;
-        
+
         parent_sess = ddf_dev_parent_sess_get(dev);
         if (parent_sess == NULL) {
@@ -424 +424 @@
                 goto error;
         }
-        
+
         rc = chardev_open(parent_sess, &kbd->chardev);
         if (rc != EOK) {
@@ -430 +430 @@
                 goto error;
         }
-        
+
         kbd->kbd_fun = ddf_fun_create(dev, fun_exposed, "kbd");
         if (kbd->kbd_fun == NULL) {
@@ -437 +437 @@
                 goto error;
         }
-        
+
         ddf_fun_set_ops(kbd->kbd_fun, &kbd_ops);
-        
+
         rc = ddf_fun_bind(kbd->kbd_fun);
         if (rc != EOK) {
@@ -445 +445 @@
                 goto error;
         }
-        
+
         rc = ddf_fun_add_to_category(kbd->kbd_fun, "keyboard");
         if (rc != EOK) {
@@ -452 +452 @@
                 goto error;
         }
-        
+
         kbd->polling_fibril = fibril_create(polling, kbd);
         if (kbd->polling_fibril == 0) {
@@ -459 +459 @@
                 goto error;
         }
-        
+
         fibril_add_ready(kbd->polling_fibril);
         return EOK;