Changeset 8565a42 in mainline for uspace/drv/hid

Timestamp:

2018-03-02T20:34:50Z (8 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

a1a81f69, d5e5fd1

Parents:

3061bc1 (diff), 34e1206 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-02 20:34:50)

git-committer:

GitHub <noreply@…> (2018-03-02 20:34:50)

Message:

Remove all trailing whitespace, everywhere.

See individual commit messages for details.

Location:

uspace/drv/hid

Files:

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

uspace/drv/hid/atkbd/atkbd.c

@@ -205 +205 @@
         size_t nwr;
         errno_t rc;
-        
+
         while (true) {
                 uint8_t code = 0;
@@ -211 +211 @@
                 if (rc != EOK)
                         return EIO;
-                
+
                 const unsigned int *map;
                 size_t map_size;
-                
+
                 if (code == KBD_SCANCODE_SET_EXTENDED) {
                         map = scanmap_e0;
                         map_size = sizeof(scanmap_e0) / sizeof(unsigned int);
-                        
+
                         rc = chardev_read(kbd->chardev, &code, 1, &nwr);
                         if (rc != EOK)
@@ -270 +270 @@
                         map_size = sizeof(scanmap_simple) / sizeof(unsigned int);
                 }
-                
+
                 kbd_event_type_t type;
                 if (code == KBD_SCANCODE_KEY_RELEASE) {
@@ -280 +280 @@
                         type = KEY_PRESS;
                 }
-                
+
                 const unsigned int key = (code < map_size) ? map[code] : 0;
-                
+
                 if (key != 0)
                         push_event(kbd->client_sess, type, key);
@@ -315 +315 @@
                 async_sess_t *sess =
                     async_callback_receive_start(EXCHANGE_SERIALIZE, icall);
-                
+
                 /* Probably ENOMEM error, try again. */
                 if (sess == NULL) {
@@ -323 +323 @@
                         break;
                 }
-                
+
                 if (kbd->client_sess == NULL) {
                         kbd->client_sess = sess;
@@ -332 +332 @@
                         async_answer_0(icallid, ELIMIT);
                 }
-                
+
                 break;
         }
@@ -359 +359 @@
         async_sess_t *parent_sess;
         errno_t rc;
-        
+
         assert(kbd);
         assert(dev);
-        
+
         kbd->client_sess = NULL;
         parent_sess = ddf_dev_parent_sess_get(dev);
@@ -370 +370 @@
                 goto error;
         }
-        
+
         rc = chardev_open(parent_sess, &kbd->chardev);
         if (rc != EOK) {
@@ -376 +376 @@
                 return EIO;
         }
-        
+
         kbd->kbd_fun = ddf_fun_create(dev, fun_exposed, "kbd");
         if (!kbd->kbd_fun) {
@@ -382 +382 @@
                 return ENOMEM;
         }
-        
+
         ddf_fun_set_ops(kbd->kbd_fun, &kbd_ops);
-        
+
         errno_t ret = ddf_fun_bind(kbd->kbd_fun);
         if (ret != EOK) {
@@ -391 +391 @@
                 return EEXIST;
         }
-        
+
         ret = ddf_fun_add_to_category(kbd->kbd_fun, "keyboard");
         if (ret != EOK) {
@@ -400 +400 @@
                 return ENOMEM;
         }
-        
+
         kbd->polling_fibril = fibril_create(polling, kbd);
         if (!kbd->polling_fibril) {
@@ -408 +408 @@
                 return ENOMEM;
         }
-        
+
         fibril_add_ready(kbd->polling_fibril);
         return EOK;

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;

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;