Re: [Qemu-devel] [PATCH] ps2: Fix lost scancodes by recent changes

["Hervé Poussineau" <hpoussin@reactos.org>]

Le 23/12/2016 à 14:00, OGAWA Hirofumi a écrit :
>
> With "ps2: use QEMU qcodes instead of scancodes", key handling was
> changed to qcode base. But all scancodes are not converted to new one.
>
> This adds some missing qcodes what I found in using.
>
> Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
> ---
>
>  hw/input/ps2.c    |    3 +++
>  qapi-schema.json  |    3 ++-
>  ui/input-keymap.c |    3 +++
>  3 files changed, 8 insertions(+), 1 deletion(-)
>
> diff -puN hw/input/ps2.c~fix-ps2-scancode hw/input/ps2.c
> --- qemu/hw/input/ps2.c~fix-ps2-scancode	2016-12-23 21:14:59.837729450 +0900
> +++ qemu-hirofumi/hw/input/ps2.c	2016-12-23 21:14:59.840729469 +0900
> @@ -394,6 +394,9 @@ static const uint16_t qcode_to_keycode_s
>      [Q_KEY_CODE_LESS] = 0x61,
>      [Q_KEY_CODE_SYSRQ] = 0x7f,
>      [Q_KEY_CODE_RO] = 0x51,
> +    [Q_KEY_CODE_HIRAGANA] = 0x13,
> +    [Q_KEY_CODE_HENKAN] = 0x64,
> +    [Q_KEY_CODE_YEN] = 0x6a,
>      [Q_KEY_CODE_KP_COMMA] = 0x6d,
>  };
>
> diff -puN qapi-schema.json~fix-ps2-scancode qapi-schema.json
> --- qemu/qapi-schema.json~fix-ps2-scancode	2016-12-23 21:14:59.838729456 +0900
> +++ qemu-hirofumi/qapi-schema.json	2016-12-23 21:14:59.840729469 +0900
> @@ -3642,7 +3642,8 @@
>              'kp_9', 'less', 'f11', 'f12', 'print', 'home', 'pgup', 'pgdn', 'end',
>              'left', 'up', 'down', 'right', 'insert', 'delete', 'stop', 'again',
>              'props', 'undo', 'front', 'copy', 'open', 'paste', 'find', 'cut',
> -            'lf', 'help', 'meta_l', 'meta_r', 'compose', 'pause', 'ro',
> +            'lf', 'help', 'meta_l', 'meta_r', 'compose', 'pause',
> +            'ro', 'hiragana', 'henkan', 'yen',
>              'kp_comma', 'kp_equals', 'power' ] }
>
>  ##
> diff -puN ui/input-keymap.c~fix-ps2-scancode ui/input-keymap.c
> --- qemu/ui/input-keymap.c~fix-ps2-scancode	2016-12-23 21:14:59.839729463 +0900
> +++ qemu-hirofumi/ui/input-keymap.c	2016-12-23 21:14:59.840729469 +0900
> @@ -131,6 +131,9 @@ static const int qcode_to_number[] = {
>      [Q_KEY_CODE_DELETE] = 0xd3,
>
>      [Q_KEY_CODE_RO] = 0x73,
> +    [Q_KEY_CODE_HIRAGANA] = 0x70,
> +    [Q_KEY_CODE_HENKAN] = 0x79,
> +    [Q_KEY_CODE_YEN] = 0x7d,
>      [Q_KEY_CODE_KP_COMMA] = 0x7e,
>
>      [Q_KEY_CODE__MAX] = 0,

Can you also add the keycodes for scancode set 1:
+    [Q_KEY_CODE_HIRAGANA] = 0x70,
+    [Q_KEY_CODE_HENKAN] = 0x79,
+    [Q_KEY_CODE_YEN] = 0x7d,

and scancode set 3:
+    [Q_KEY_CODE_HIRAGANA] = 0x87,
+    [Q_KEY_CODE_HENKAN] = 0x86,
+    [Q_KEY_CODE_YEN] = 0x51,

Hervé