Index: uspace/drv/hid/xtkbd/xtkbd.c =================================================================== --- uspace/drv/hid/xtkbd/xtkbd.c (revision b7fd2a02e4161f4edd38548e7f8456b8021549be) +++ uspace/drv/hid/xtkbd/xtkbd.c (revision f1380b76772fb5d1aa03637b5e57bd9b929fea61) @@ -47,5 +47,5 @@ static const unsigned int scanmap_simple[] = { [0x29] = KC_BACKTICK, - + [0x02] = KC_1, [0x03] = KC_2, @@ -58,11 +58,11 @@ [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,10 +75,10 @@ [0x18] = KC_O, [0x19] = KC_P, - + [0x1a] = KC_LBRACKET, [0x1b] = KC_RBRACKET, - + [0x3a] = KC_CAPS_LOCK, - + [0x1e] = KC_A, [0x1f] = KC_S, @@ -90,11 +90,11 @@ [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,17 +104,17 @@ [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,16 +124,16 @@ [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,20 +162,20 @@ [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,66 +210,66 @@ 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,46 +277,46 @@ 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,5 +351,5 @@ ((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,5 +370,5 @@ async_sess_t *sess = async_callback_receive_start(EXCHANGE_SERIALIZE, icall); - + /* Probably ENOMEM error, try again. */ if (sess == NULL) { @@ -378,5 +378,5 @@ break; } - + if (kbd->client_sess == NULL) { kbd->client_sess = sess; @@ -387,5 +387,5 @@ async_answer_0(icallid, ELIMIT); } - + break; } @@ -415,7 +415,7 @@ bool bound = false; errno_t rc; - + kbd->client_sess = NULL; - + parent_sess = ddf_dev_parent_sess_get(dev); if (parent_sess == NULL) { @@ -424,5 +424,5 @@ goto error; } - + rc = chardev_open(parent_sess, &kbd->chardev); if (rc != EOK) { @@ -430,5 +430,5 @@ goto error; } - + kbd->kbd_fun = ddf_fun_create(dev, fun_exposed, "kbd"); if (kbd->kbd_fun == NULL) { @@ -437,7 +437,7 @@ goto error; } - + ddf_fun_set_ops(kbd->kbd_fun, &kbd_ops); - + rc = ddf_fun_bind(kbd->kbd_fun); if (rc != EOK) { @@ -445,5 +445,5 @@ goto error; } - + rc = ddf_fun_add_to_category(kbd->kbd_fun, "keyboard"); if (rc != EOK) { @@ -452,5 +452,5 @@ goto error; } - + kbd->polling_fibril = fibril_create(polling, kbd); if (kbd->polling_fibril == 0) { @@ -459,5 +459,5 @@ goto error; } - + fibril_add_ready(kbd->polling_fibril); return EOK;