From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56280) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bkICL-00087l-It for qemu-devel@nongnu.org; Wed, 14 Sep 2016 17:58:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bkICH-0008GK-Iq for qemu-devel@nongnu.org; Wed, 14 Sep 2016 17:58:28 -0400 Received: from smtp2-g21.free.fr ([212.27.42.2]:53620) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bkICH-00089L-9x for qemu-devel@nongnu.org; Wed, 14 Sep 2016 17:58:25 -0400 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Wed, 14 Sep 2016 23:57:44 +0200 Message-Id: <1473890265-3304-5-git-send-email-hpoussin@reactos.org> In-Reply-To: <1473890265-3304-1-git-send-email-hpoussin@reactos.org> References: <1473890265-3304-1-git-send-email-hpoussin@reactos.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 4/5] ps2: use QEMU qcodes instead of scancodes List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: "Michael S. Tsirkin" , =?UTF-8?q?Herv=C3=A9=20Poussineau?= This fixes problems with translated set 1, where most make code were wron= g. This fixes problems with set 3 for extended keys (like arrows) and lot of= other keys. Added a FIXME for set 3, where most keys must not (by default) deliver a = break code. Detailed list of changes on untranslated set 2: - change of ALTGR break code from 0xe4 to 0xf0 0x08 - change of ALTGR_R break code from 0xe0 0xe4 to 0xe0 0xf0 0x08 - change of F7 make code from 0x02 to 0x83 - change of F7 break code from 0xf0 0x02 to 0xf0 0x83 - change of PRINT make code from 0xe0 0x7c to 0xe0 0x12 0xe0 0x7c - change of PRINT break code from 0xe0 0xf0 0x7c to 0xe0 0xf0 0x7c 0xe0 0= xf0 0x12 - change of PAUSE key: new make code =3D old make code + old break code, = no more break code - change on RO break code from 0xf3 to 0xf0 0x51 - change on KP_COMMA break code from 0xfe to 0xf0 0x6d Detailed list of changes on translated set 2 (the most commonly used): - change of PRINT make code from 0xe0 0x37 to 0xe0 0x2a 0xe0 0x37 - change of PRINT break code from 0xe0 0xb7 to 0xe0 0xb7 0xe0 0xaa - change of PAUSE key: new make code =3D old make code + old break code, = no more break code Reference: http://www.computer-engineering.org/ps2keyboard/scancodes1.html http://www.computer-engineering.org/ps2keyboard/scancodes2.html http://www.computer-engineering.org/ps2keyboard/scancodes3.html Signed-off-by: Herv=C3=A9 Poussineau --- hw/input/ps2.c | 533 +++++++++++++++++++++++++++++++++++++++++++++++++++= ------ 1 file changed, 485 insertions(+), 48 deletions(-) diff --git a/hw/input/ps2.c b/hw/input/ps2.c index c432fc5..3d7205d 100644 --- a/hw/input/ps2.c +++ b/hw/input/ps2.c @@ -114,26 +114,395 @@ typedef struct { uint8_t mouse_buttons; } PS2MouseState; =20 -/* Table to convert from PC scancodes to raw scancodes. */ -static const unsigned char ps2_raw_keycode[128] =3D { - 0, 118, 22, 30, 38, 37, 46, 54, 61, 62, 70, 69, 78, 85, 10= 2, 13, - 21, 29, 36, 45, 44, 53, 60, 67, 68, 77, 84, 91, 90, 20, 2= 8, 27, - 35, 43, 52, 51, 59, 66, 75, 76, 82, 14, 18, 93, 26, 34, 3= 3, 42, - 50, 49, 58, 65, 73, 74, 89, 124, 17, 41, 88, 5, 6, 4, 1= 2, 3, - 11, 2, 10, 1, 9, 119, 126, 108, 117, 125, 123, 107, 115, 116, 12= 1, 105, -114, 122, 112, 113, 127, 96, 97, 120, 7, 15, 23, 31, 39, 47, 5= 5, 63, - 71, 79, 86, 94, 8, 16, 24, 32, 40, 48, 56, 64, 72, 80, 8= 7, 111, - 19, 25, 57, 81, 83, 92, 95, 98, 99, 100, 101, 103, 104, 106, 10= 9, 110 +/* Table to convert from QEMU codes to scancodes. */ +static const uint16_t qcode_to_keycode_set1[Q_KEY_CODE__MAX] =3D { + [0 ... Q_KEY_CODE__MAX - 1] =3D 0, + + [Q_KEY_CODE_A] =3D 0x1e, + [Q_KEY_CODE_B] =3D 0x30, + [Q_KEY_CODE_C] =3D 0x2e, + [Q_KEY_CODE_D] =3D 0x20, + [Q_KEY_CODE_E] =3D 0x12, + [Q_KEY_CODE_F] =3D 0x21, + [Q_KEY_CODE_G] =3D 0x22, + [Q_KEY_CODE_H] =3D 0x23, + [Q_KEY_CODE_I] =3D 0x17, + [Q_KEY_CODE_J] =3D 0x24, + [Q_KEY_CODE_K] =3D 0x25, + [Q_KEY_CODE_L] =3D 0x26, + [Q_KEY_CODE_M] =3D 0x32, + [Q_KEY_CODE_N] =3D 0x31, + [Q_KEY_CODE_O] =3D 0x18, + [Q_KEY_CODE_P] =3D 0x19, + [Q_KEY_CODE_Q] =3D 0x10, + [Q_KEY_CODE_R] =3D 0x13, + [Q_KEY_CODE_S] =3D 0x1f, + [Q_KEY_CODE_T] =3D 0x14, + [Q_KEY_CODE_U] =3D 0x16, + [Q_KEY_CODE_V] =3D 0x2f, + [Q_KEY_CODE_W] =3D 0x11, + [Q_KEY_CODE_X] =3D 0x2d, + [Q_KEY_CODE_Y] =3D 0x15, + [Q_KEY_CODE_Z] =3D 0x2c, + [Q_KEY_CODE_0] =3D 0x0b, + [Q_KEY_CODE_1] =3D 0x02, + [Q_KEY_CODE_2] =3D 0x03, + [Q_KEY_CODE_3] =3D 0x04, + [Q_KEY_CODE_4] =3D 0x05, + [Q_KEY_CODE_5] =3D 0x06, + [Q_KEY_CODE_6] =3D 0x07, + [Q_KEY_CODE_7] =3D 0x08, + [Q_KEY_CODE_8] =3D 0x09, + [Q_KEY_CODE_9] =3D 0x0a, + [Q_KEY_CODE_GRAVE_ACCENT] =3D 0x29, + [Q_KEY_CODE_MINUS] =3D 0x0c, + [Q_KEY_CODE_EQUAL] =3D 0x0d, + [Q_KEY_CODE_BACKSLASH] =3D 0x2b, + [Q_KEY_CODE_BACKSPACE] =3D 0x0e, + [Q_KEY_CODE_SPC] =3D 0x39, + [Q_KEY_CODE_TAB] =3D 0x0f, + [Q_KEY_CODE_CAPS_LOCK] =3D 0x3a, + [Q_KEY_CODE_SHIFT] =3D 0x2a, + [Q_KEY_CODE_CTRL] =3D 0x1d, + [Q_KEY_CODE_META_L] =3D 0xe05b, + [Q_KEY_CODE_ALT] =3D 0x38, + [Q_KEY_CODE_SHIFT_R] =3D 0x36, + [Q_KEY_CODE_CTRL_R] =3D 0xe01d, + [Q_KEY_CODE_META_R] =3D 0xe05c, + [Q_KEY_CODE_ALT_R] =3D 0xe038, + [Q_KEY_CODE_MENU] =3D 0xe05d, + [Q_KEY_CODE_RET] =3D 0x1c, + [Q_KEY_CODE_ESC] =3D 0x01, + [Q_KEY_CODE_F1] =3D 0x3b, + [Q_KEY_CODE_F2] =3D 0x3c, + [Q_KEY_CODE_F3] =3D 0x3d, + [Q_KEY_CODE_F4] =3D 0x3e, + [Q_KEY_CODE_F5] =3D 0x3f, + [Q_KEY_CODE_F6] =3D 0x40, + [Q_KEY_CODE_F7] =3D 0x41, + [Q_KEY_CODE_F8] =3D 0x42, + [Q_KEY_CODE_F9] =3D 0x43, + [Q_KEY_CODE_F10] =3D 0x44, + [Q_KEY_CODE_F11] =3D 0x57, + [Q_KEY_CODE_F12] =3D 0x58, + /* special handling for Q_KEY_CODE_PRINT */ + [Q_KEY_CODE_SCROLL_LOCK] =3D 0x46, + /* special handling for Q_KEY_CODE_PAUSE */ + [Q_KEY_CODE_BRACKET_LEFT] =3D 0x1a, + [Q_KEY_CODE_INSERT] =3D 0xe052, + [Q_KEY_CODE_HOME] =3D 0xe047, + [Q_KEY_CODE_PGUP] =3D 0xe049, + [Q_KEY_CODE_DELETE] =3D 0xe053, + [Q_KEY_CODE_END] =3D 0xe04f, + [Q_KEY_CODE_PGDN] =3D 0xe051, + [Q_KEY_CODE_UP] =3D 0xe048, + [Q_KEY_CODE_LEFT] =3D 0xe04b, + [Q_KEY_CODE_DOWN] =3D 0xe050, + [Q_KEY_CODE_RIGHT] =3D 0xe04d, + [Q_KEY_CODE_NUM_LOCK] =3D 0x45, + [Q_KEY_CODE_KP_DIVIDE] =3D 0xe035, + [Q_KEY_CODE_KP_MULTIPLY] =3D 0x37, + [Q_KEY_CODE_KP_SUBTRACT] =3D 0x4a, + [Q_KEY_CODE_KP_ADD] =3D 0x4e, + [Q_KEY_CODE_KP_ENTER] =3D 0xe01c, + [Q_KEY_CODE_KP_DECIMAL] =3D 0x53, + [Q_KEY_CODE_KP_0] =3D 0x52, + [Q_KEY_CODE_KP_1] =3D 0x4f, + [Q_KEY_CODE_KP_2] =3D 0x50, + [Q_KEY_CODE_KP_3] =3D 0x51, + [Q_KEY_CODE_KP_4] =3D 0x4b, + [Q_KEY_CODE_KP_5] =3D 0x4c, + [Q_KEY_CODE_KP_6] =3D 0x4d, + [Q_KEY_CODE_KP_7] =3D 0x47, + [Q_KEY_CODE_KP_8] =3D 0x48, + [Q_KEY_CODE_KP_9] =3D 0x49, + [Q_KEY_CODE_BRACKET_RIGHT] =3D 0x1b, + [Q_KEY_CODE_SEMICOLON] =3D 0x27, + [Q_KEY_CODE_APOSTROPHE] =3D 0x28, + [Q_KEY_CODE_COMMA] =3D 0x33, + [Q_KEY_CODE_DOT] =3D 0x34, + [Q_KEY_CODE_SLASH] =3D 0x35, + +#if 0 + [Q_KEY_CODE_POWER] =3D 0x0e5e, + [Q_KEY_CODE_SLEEP] =3D 0x0e5f, + [Q_KEY_CODE_WAKE] =3D 0x0e63, + + [Q_KEY_CODE_AUDIONEXT] =3D 0xe019, + [Q_KEY_CODE_AUDIOPREV] =3D 0xe010, + [Q_KEY_CODE_AUDIOSTOP] =3D 0xe024, + [Q_KEY_CODE_AUDIOPLAY] =3D 0xe022, + [Q_KEY_CODE_AUDIOMUTE] =3D 0xe020, + [Q_KEY_CODE_VOLUMEUP] =3D 0xe030, + [Q_KEY_CODE_VOLUMEDOWN] =3D 0xe02e, + [Q_KEY_CODE_MEDIASELECT] =3D 0xe06d, + [Q_KEY_CODE_MAIL] =3D 0xe06c, + [Q_KEY_CODE_CALCULATOR] =3D 0xe021, + [Q_KEY_CODE_COMPUTER] =3D 0xe06b, + [Q_KEY_CODE_AC_SEARCH] =3D 0xe065, + [Q_KEY_CODE_AC_HOME] =3D 0xe032, + [Q_KEY_CODE_AC_BACK] =3D 0xe06a, + [Q_KEY_CODE_AC_FORWARD] =3D 0xe069, + [Q_KEY_CODE_AC_STOP] =3D 0xe068, + [Q_KEY_CODE_AC_REFRESH] =3D 0xe067, + [Q_KEY_CODE_AC_BOOKMARKS] =3D 0xe066, +#endif + + [Q_KEY_CODE_ASTERISK] =3D 0x37, + [Q_KEY_CODE_LESS] =3D 0x56, + [Q_KEY_CODE_RO] =3D 0x73, + [Q_KEY_CODE_KP_COMMA] =3D 0x7e, }; -static const unsigned char ps2_raw_keycode_set3[128] =3D { - 0, 8, 22, 30, 38, 37, 46, 54, 61, 62, 70, 69, 78, 85, 10= 2, 13, - 21, 29, 36, 45, 44, 53, 60, 67, 68, 77, 84, 91, 90, 17, 2= 8, 27, - 35, 43, 52, 51, 59, 66, 75, 76, 82, 14, 18, 92, 26, 34, 3= 3, 42, - 50, 49, 58, 65, 73, 74, 89, 126, 25, 41, 20, 7, 15, 23, 3= 1, 39, - 47, 2, 63, 71, 79, 118, 95, 108, 117, 125, 132, 107, 115, 116, 12= 4, 105, -114, 122, 112, 113, 127, 96, 97, 86, 94, 15, 23, 31, 39, 47, 5= 5, 63, - 71, 79, 86, 94, 8, 16, 24, 32, 40, 48, 56, 64, 72, 80, 8= 7, 111, - 19, 25, 57, 81, 83, 92, 95, 98, 99, 100, 101, 103, 104, 106, 10= 9, 110 + +static const uint16_t qcode_to_keycode_set2[Q_KEY_CODE__MAX] =3D { + [0 ... Q_KEY_CODE__MAX - 1] =3D 0, + + [Q_KEY_CODE_A] =3D 0x1c, + [Q_KEY_CODE_B] =3D 0x32, + [Q_KEY_CODE_C] =3D 0x21, + [Q_KEY_CODE_D] =3D 0x23, + [Q_KEY_CODE_E] =3D 0x24, + [Q_KEY_CODE_F] =3D 0x2b, + [Q_KEY_CODE_G] =3D 0x34, + [Q_KEY_CODE_H] =3D 0x33, + [Q_KEY_CODE_I] =3D 0x43, + [Q_KEY_CODE_J] =3D 0x3b, + [Q_KEY_CODE_K] =3D 0x42, + [Q_KEY_CODE_L] =3D 0x4b, + [Q_KEY_CODE_M] =3D 0x3a, + [Q_KEY_CODE_N] =3D 0x31, + [Q_KEY_CODE_O] =3D 0x44, + [Q_KEY_CODE_P] =3D 0x4d, + [Q_KEY_CODE_Q] =3D 0x15, + [Q_KEY_CODE_R] =3D 0x2d, + [Q_KEY_CODE_S] =3D 0x1b, + [Q_KEY_CODE_T] =3D 0x2c, + [Q_KEY_CODE_U] =3D 0x3c, + [Q_KEY_CODE_V] =3D 0x2a, + [Q_KEY_CODE_W] =3D 0x1d, + [Q_KEY_CODE_X] =3D 0x22, + [Q_KEY_CODE_Y] =3D 0x35, + [Q_KEY_CODE_Z] =3D 0x1a, + [Q_KEY_CODE_0] =3D 0x45, + [Q_KEY_CODE_1] =3D 0x16, + [Q_KEY_CODE_2] =3D 0x1e, + [Q_KEY_CODE_3] =3D 0x26, + [Q_KEY_CODE_4] =3D 0x25, + [Q_KEY_CODE_5] =3D 0x2e, + [Q_KEY_CODE_6] =3D 0x36, + [Q_KEY_CODE_7] =3D 0x3d, + [Q_KEY_CODE_8] =3D 0x3e, + [Q_KEY_CODE_9] =3D 0x46, + [Q_KEY_CODE_GRAVE_ACCENT] =3D 0x0e, + [Q_KEY_CODE_MINUS] =3D 0x4e, + [Q_KEY_CODE_EQUAL] =3D 0x55, + [Q_KEY_CODE_BACKSLASH] =3D 0x5d, + [Q_KEY_CODE_BACKSPACE] =3D 0x66, + [Q_KEY_CODE_SPC] =3D 0x29, + [Q_KEY_CODE_TAB] =3D 0x0d, + [Q_KEY_CODE_CAPS_LOCK] =3D 0x58, + [Q_KEY_CODE_SHIFT] =3D 0x12, + [Q_KEY_CODE_CTRL] =3D 0x14, + [Q_KEY_CODE_META_L] =3D 0xe01f, + [Q_KEY_CODE_ALT] =3D 0x11, + [Q_KEY_CODE_SHIFT_R] =3D 0x59, + [Q_KEY_CODE_CTRL_R] =3D 0xe014, + [Q_KEY_CODE_META_R] =3D 0xe027, + [Q_KEY_CODE_ALT_R] =3D 0xe011, + [Q_KEY_CODE_MENU] =3D 0xe02f, + [Q_KEY_CODE_RET] =3D 0x5a, + [Q_KEY_CODE_ESC] =3D 0x76, + [Q_KEY_CODE_F1] =3D 0x05, + [Q_KEY_CODE_F2] =3D 0x06, + [Q_KEY_CODE_F3] =3D 0x04, + [Q_KEY_CODE_F4] =3D 0x0c, + [Q_KEY_CODE_F5] =3D 0x03, + [Q_KEY_CODE_F6] =3D 0x0b, + [Q_KEY_CODE_F7] =3D 0x83, + [Q_KEY_CODE_F8] =3D 0x0a, + [Q_KEY_CODE_F9] =3D 0x01, + [Q_KEY_CODE_F10] =3D 0x09, + [Q_KEY_CODE_F11] =3D 0x78, + [Q_KEY_CODE_F12] =3D 0x07, + /* special handling for Q_KEY_CODE_PRINT */ + [Q_KEY_CODE_SCROLL_LOCK] =3D 0x7e, + /* special handling for Q_KEY_CODE_PAUSE */ + [Q_KEY_CODE_BRACKET_LEFT] =3D 0x54, + [Q_KEY_CODE_INSERT] =3D 0xe070, + [Q_KEY_CODE_HOME] =3D 0xe06c, + [Q_KEY_CODE_PGUP] =3D 0xe07d, + [Q_KEY_CODE_DELETE] =3D 0xe071, + [Q_KEY_CODE_END] =3D 0xe069, + [Q_KEY_CODE_PGDN] =3D 0xe07a, + [Q_KEY_CODE_UP] =3D 0xe075, + [Q_KEY_CODE_LEFT] =3D 0xe06b, + [Q_KEY_CODE_DOWN] =3D 0xe072, + [Q_KEY_CODE_RIGHT] =3D 0xe074, + [Q_KEY_CODE_NUM_LOCK] =3D 0x77, + [Q_KEY_CODE_KP_DIVIDE] =3D 0xe04a, + [Q_KEY_CODE_KP_MULTIPLY] =3D 0x7c, + [Q_KEY_CODE_KP_SUBTRACT] =3D 0x7b, + [Q_KEY_CODE_KP_ADD] =3D 0x79, + [Q_KEY_CODE_KP_ENTER] =3D 0xe05a, + [Q_KEY_CODE_KP_DECIMAL] =3D 0x71, + [Q_KEY_CODE_KP_0] =3D 0x70, + [Q_KEY_CODE_KP_1] =3D 0x69, + [Q_KEY_CODE_KP_2] =3D 0x72, + [Q_KEY_CODE_KP_3] =3D 0x7a, + [Q_KEY_CODE_KP_4] =3D 0x6b, + [Q_KEY_CODE_KP_5] =3D 0x73, + [Q_KEY_CODE_KP_6] =3D 0x74, + [Q_KEY_CODE_KP_7] =3D 0x6c, + [Q_KEY_CODE_KP_8] =3D 0x75, + [Q_KEY_CODE_KP_9] =3D 0x7d, + [Q_KEY_CODE_BRACKET_RIGHT] =3D 0x5b, + [Q_KEY_CODE_SEMICOLON] =3D 0x4c, + [Q_KEY_CODE_APOSTROPHE] =3D 0x52, + [Q_KEY_CODE_COMMA] =3D 0x41, + [Q_KEY_CODE_DOT] =3D 0x49, + [Q_KEY_CODE_SLASH] =3D 0x4a, + +#if 0 + [Q_KEY_CODE_POWER] =3D 0x0e37, + [Q_KEY_CODE_SLEEP] =3D 0x0e3f, + [Q_KEY_CODE_WAKE] =3D 0x0e5e, + + [Q_KEY_CODE_AUDIONEXT] =3D 0xe04d, + [Q_KEY_CODE_AUDIOPREV] =3D 0xe015, + [Q_KEY_CODE_AUDIOSTOP] =3D 0xe03b, + [Q_KEY_CODE_AUDIOPLAY] =3D 0xe034, + [Q_KEY_CODE_AUDIOMUTE] =3D 0xe023, + [Q_KEY_CODE_VOLUMEUP] =3D 0xe032, + [Q_KEY_CODE_VOLUMEDOWN] =3D 0xe021, + [Q_KEY_CODE_MEDIASELECT] =3D 0xe050, + [Q_KEY_CODE_MAIL] =3D 0xe048, + [Q_KEY_CODE_CALCULATOR] =3D 0xe02b, + [Q_KEY_CODE_COMPUTER] =3D 0xe040, + [Q_KEY_CODE_AC_SEARCH] =3D 0xe010, + [Q_KEY_CODE_AC_HOME] =3D 0xe03a, + [Q_KEY_CODE_AC_BACK] =3D 0xe038, + [Q_KEY_CODE_AC_FORWARD] =3D 0xe030, + [Q_KEY_CODE_AC_STOP] =3D 0xe028, + [Q_KEY_CODE_AC_REFRESH] =3D 0xe020, + [Q_KEY_CODE_AC_BOOKMARKS] =3D 0xe018, +#endif + + [Q_KEY_CODE_ALTGR] =3D 0x08, + [Q_KEY_CODE_ALTGR_R] =3D 0xe008, + [Q_KEY_CODE_ASTERISK] =3D 0x7c, + [Q_KEY_CODE_LESS] =3D 0x61, + [Q_KEY_CODE_SYSRQ] =3D 0x7f, + [Q_KEY_CODE_RO] =3D 0x51, + [Q_KEY_CODE_KP_COMMA] =3D 0x6d, +}; + +static const uint16_t qcode_to_keycode_set3[Q_KEY_CODE__MAX] =3D { + [0 ... Q_KEY_CODE__MAX - 1] =3D 0, + + [Q_KEY_CODE_A] =3D 0x1c, + [Q_KEY_CODE_B] =3D 0x32, + [Q_KEY_CODE_C] =3D 0x21, + [Q_KEY_CODE_D] =3D 0x23, + [Q_KEY_CODE_E] =3D 0x24, + [Q_KEY_CODE_F] =3D 0x2b, + [Q_KEY_CODE_G] =3D 0x34, + [Q_KEY_CODE_H] =3D 0x33, + [Q_KEY_CODE_I] =3D 0x43, + [Q_KEY_CODE_J] =3D 0x3b, + [Q_KEY_CODE_K] =3D 0x42, + [Q_KEY_CODE_L] =3D 0x4b, + [Q_KEY_CODE_M] =3D 0x3a, + [Q_KEY_CODE_N] =3D 0x31, + [Q_KEY_CODE_O] =3D 0x44, + [Q_KEY_CODE_P] =3D 0x4d, + [Q_KEY_CODE_Q] =3D 0x15, + [Q_KEY_CODE_R] =3D 0x2d, + [Q_KEY_CODE_S] =3D 0x1b, + [Q_KEY_CODE_T] =3D 0x2c, + [Q_KEY_CODE_U] =3D 0x3c, + [Q_KEY_CODE_V] =3D 0x2a, + [Q_KEY_CODE_W] =3D 0x1d, + [Q_KEY_CODE_X] =3D 0x22, + [Q_KEY_CODE_Y] =3D 0x35, + [Q_KEY_CODE_Z] =3D 0x1a, + [Q_KEY_CODE_0] =3D 0x45, + [Q_KEY_CODE_1] =3D 0x16, + [Q_KEY_CODE_2] =3D 0x1e, + [Q_KEY_CODE_3] =3D 0x26, + [Q_KEY_CODE_4] =3D 0x25, + [Q_KEY_CODE_5] =3D 0x2e, + [Q_KEY_CODE_6] =3D 0x36, + [Q_KEY_CODE_7] =3D 0x3d, + [Q_KEY_CODE_8] =3D 0x3e, + [Q_KEY_CODE_9] =3D 0x46, + [Q_KEY_CODE_GRAVE_ACCENT] =3D 0x0e, + [Q_KEY_CODE_MINUS] =3D 0x4e, + [Q_KEY_CODE_EQUAL] =3D 0x55, + [Q_KEY_CODE_BACKSLASH] =3D 0x5c, + [Q_KEY_CODE_BACKSPACE] =3D 0x66, + [Q_KEY_CODE_SPC] =3D 0x29, + [Q_KEY_CODE_TAB] =3D 0x0d, + [Q_KEY_CODE_CAPS_LOCK] =3D 0x14, + [Q_KEY_CODE_SHIFT] =3D 0x12, + [Q_KEY_CODE_CTRL] =3D 0x11, + [Q_KEY_CODE_META_L] =3D 0x8b, + [Q_KEY_CODE_ALT] =3D 0x19, + [Q_KEY_CODE_SHIFT_R] =3D 0x59, + [Q_KEY_CODE_CTRL_R] =3D 0x58, + [Q_KEY_CODE_META_R] =3D 0x8c, + [Q_KEY_CODE_ALT_R] =3D 0x39, + [Q_KEY_CODE_MENU] =3D 0x8d, + [Q_KEY_CODE_RET] =3D 0x5a, + [Q_KEY_CODE_ESC] =3D 0x08, + [Q_KEY_CODE_F1] =3D 0x07, + [Q_KEY_CODE_F2] =3D 0x0f, + [Q_KEY_CODE_F3] =3D 0x17, + [Q_KEY_CODE_F4] =3D 0x1f, + [Q_KEY_CODE_F5] =3D 0x27, + [Q_KEY_CODE_F6] =3D 0x2f, + [Q_KEY_CODE_F7] =3D 0x37, + [Q_KEY_CODE_F8] =3D 0x3f, + [Q_KEY_CODE_F9] =3D 0x47, + [Q_KEY_CODE_F10] =3D 0x4f, + [Q_KEY_CODE_F11] =3D 0x56, + [Q_KEY_CODE_F12] =3D 0x5e, + [Q_KEY_CODE_PRINT] =3D 0x57, + [Q_KEY_CODE_SCROLL_LOCK] =3D 0x5f, + [Q_KEY_CODE_PAUSE] =3D 0x62, + [Q_KEY_CODE_BRACKET_LEFT] =3D 0x54, + [Q_KEY_CODE_INSERT] =3D 0x67, + [Q_KEY_CODE_HOME] =3D 0x6e, + [Q_KEY_CODE_PGUP] =3D 0x6f, + [Q_KEY_CODE_DELETE] =3D 0x64, + [Q_KEY_CODE_END] =3D 0x65, + [Q_KEY_CODE_PGDN] =3D 0x6d, + [Q_KEY_CODE_UP] =3D 0x63, + [Q_KEY_CODE_LEFT] =3D 0x61, + [Q_KEY_CODE_DOWN] =3D 0x60, + [Q_KEY_CODE_RIGHT] =3D 0x6a, + [Q_KEY_CODE_NUM_LOCK] =3D 0x76, + [Q_KEY_CODE_KP_DIVIDE] =3D 0x4a, + [Q_KEY_CODE_KP_MULTIPLY] =3D 0x7e, + [Q_KEY_CODE_KP_SUBTRACT] =3D 0x4e, + [Q_KEY_CODE_KP_ADD] =3D 0x7c, + [Q_KEY_CODE_KP_ENTER] =3D 0x79, + [Q_KEY_CODE_KP_DECIMAL] =3D 0x71, + [Q_KEY_CODE_KP_0] =3D 0x70, + [Q_KEY_CODE_KP_1] =3D 0x69, + [Q_KEY_CODE_KP_2] =3D 0x72, + [Q_KEY_CODE_KP_3] =3D 0x7a, + [Q_KEY_CODE_KP_4] =3D 0x6b, + [Q_KEY_CODE_KP_5] =3D 0x73, + [Q_KEY_CODE_KP_6] =3D 0x74, + [Q_KEY_CODE_KP_7] =3D 0x6c, + [Q_KEY_CODE_KP_8] =3D 0x75, + [Q_KEY_CODE_KP_9] =3D 0x7d, + [Q_KEY_CODE_BRACKET_RIGHT] =3D 0x5b, + [Q_KEY_CODE_SEMICOLON] =3D 0x4c, + [Q_KEY_CODE_APOSTROPHE] =3D 0x52, + [Q_KEY_CODE_COMMA] =3D 0x41, + [Q_KEY_CODE_DOT] =3D 0x49, + [Q_KEY_CODE_SLASH] =3D 0x4a, }; =20 static uint8_t translate_table[256] =3D { @@ -195,43 +564,111 @@ static void ps2_keyboard_event(DeviceState *dev, Q= emuConsole *src, InputEvent *evt) { PS2KbdState *s =3D (PS2KbdState *)dev; - int scancodes[3], i, count; InputKeyEvent *key =3D evt->u.key.data; - int keycode; + int qcode; + uint16_t keycode; =20 qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER); - count =3D qemu_input_key_value_to_scancode(key->key, - key->down, - scancodes); - - /* handle invalid key */ - if (count =3D=3D 1 && scancodes[0] =3D=3D 0x00) { - ps2_queue(&s->common, 0x00); - return; - } else if (count =3D=3D 1 && scancodes[0] =3D=3D 0x80) { - if (s->translate || s->scancode_set =3D=3D 1) { - ps2_queue(&s->common, 0x80); + assert(evt->type =3D=3D INPUT_EVENT_KIND_KEY); + qcode =3D qemu_input_key_value_to_qcode(key->key); + + if (s->scancode_set =3D=3D 1) { + if (qcode =3D=3D Q_KEY_CODE_PAUSE) { + if (key->down) { + ps2_put_keycode(s, 0xe1); + ps2_put_keycode(s, 0x1d); + ps2_put_keycode(s, 0x45); + ps2_put_keycode(s, 0x91); + ps2_put_keycode(s, 0x9d); + ps2_put_keycode(s, 0xc5); + } + } else if (qcode =3D=3D Q_KEY_CODE_PRINT) { + if (key->down) { + ps2_put_keycode(s, 0xe0); + ps2_put_keycode(s, 0x2a); + ps2_put_keycode(s, 0xe0); + ps2_put_keycode(s, 0x37); + } else { + ps2_put_keycode(s, 0xe0); + ps2_put_keycode(s, 0xb7); + ps2_put_keycode(s, 0xe0); + ps2_put_keycode(s, 0xaa); + } } else { - ps2_queue(&s->common, 0xf0); - ps2_queue(&s->common, 0x00); + keycode =3D qcode_to_keycode_set1[qcode]; + if (keycode) { + if (keycode & 0xff00) { + ps2_put_keycode(s, keycode >> 8); + } + if (!key->down) { + keycode |=3D 0x80; + } + ps2_put_keycode(s, keycode & 0xff); + } else { + ps2_queue(&s->common, key->down ? 0x00 : 0x80); + } } - return; - } - - for (i =3D 0; i < count; i++) { - /* XXX: add support for scancode set 1 */ - keycode =3D scancodes[i]; - if (keycode < 0xe0 && (s->scancode_set > 1 || s->translate)) { - if (keycode & 0x80) { - ps2_put_keycode(&s->common, 0xf0); + } else if (s->scancode_set =3D=3D 2) { + if (qcode =3D=3D Q_KEY_CODE_PAUSE) { + if (key->down) { + ps2_put_keycode(s, 0xe1); + ps2_put_keycode(s, 0x14); + ps2_put_keycode(s, 0x77); + ps2_put_keycode(s, 0xe1); + ps2_put_keycode(s, 0xf0); + ps2_put_keycode(s, 0x14); + ps2_put_keycode(s, 0xf0); + ps2_put_keycode(s, 0x77); } - if (s->scancode_set =3D=3D 1 || s->scancode_set =3D=3D 2) { - keycode =3D ps2_raw_keycode[keycode & 0x7f]; - } else if (s->scancode_set =3D=3D 3) { - keycode =3D ps2_raw_keycode_set3[keycode & 0x7f]; + } else if (qcode =3D=3D Q_KEY_CODE_PRINT) { + if (key->down) { + ps2_put_keycode(s, 0xe0); + ps2_put_keycode(s, 0x12); + ps2_put_keycode(s, 0xe0); + ps2_put_keycode(s, 0x7c); + } else { + ps2_put_keycode(s, 0xe0); + ps2_put_keycode(s, 0xf0); + ps2_put_keycode(s, 0x7c); + ps2_put_keycode(s, 0xe0); + ps2_put_keycode(s, 0xf0); + ps2_put_keycode(s, 0x12); } + } else { + keycode =3D qcode_to_keycode_set2[qcode]; + if (keycode) { + if (keycode & 0xff00) { + ps2_put_keycode(s, keycode >> 8); + } + if (!key->down) { + ps2_put_keycode(s, 0xf0); + } + ps2_put_keycode(s, keycode & 0xff); + } else if (key->down) { + ps2_queue(&s->common, 0x00); + } else if (s->translate) { + ps2_queue(&s->common, 0x80); + } else { + ps2_queue(&s->common, 0xf0); + ps2_queue(&s->common, 0x00); + } + } + } else if (s->scancode_set =3D=3D 3) { + keycode =3D qcode_to_keycode_set3[qcode]; + if (keycode) { + /* FIXME: break code should be configured on a key by key ba= sis */ + if (!key->down) { + ps2_put_keycode(s, 0xf0); + } + ps2_put_keycode(s, keycode); + } else if (key->down) { + ps2_queue(&s->common, 0x00); + } else if (s->translate) { + ps2_queue(&s->common, 0x80); + } else { + ps2_queue(&s->common, 0xf0); + ps2_queue(&s->common, 0x00); } - ps2_put_keycode(s, keycode); } } =20 --=20 2.1.4