Patchwork [v3] ps2: Fix lost scancodes by recent changes

login
register
mail settings
Submitter OGAWA Hirofumi
Date Dec. 27, 2016, 7:55 p.m.
Message ID <87mvfhw3i0.fsf_-_@mail.parknet.co.jp>
Download mbox | patch
Permalink /patch/9489845/
State New
Headers show

Comments

OGAWA Hirofumi - Dec. 27, 2016, 7:55 p.m.
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/scancodes what I found in using.

[set1 and set3 are from <hpoussin@reactos.org>]
Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
---

 hw/input/ps2.c    |   10 ++++++++++
 qapi-schema.json  |    6 +++++-
 ui/input-keymap.c |    3 +++
 3 files changed, 18 insertions(+), 1 deletion(-)
Hervé Poussineau - Dec. 27, 2016, 8:11 p.m.
Le 27/12/2016 à 20:55, 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/scancodes what I found in using.
>
> [set1 and set3 are from <hpoussin@reactos.org>]
> Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>


Reviewed-by: Hervé Poussineau <hpoussin@reactos.org>
Gerd Hoffmann - Jan. 4, 2017, 8:50 a.m.
On Mi, 2016-12-28 at 04:55 +0900, OGAWA Hirofumi wrote:
> 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/scancodes what I found in using.

Added to ui queue.

thanks,
  Gerd
Hervé Poussineau - Jan. 4, 2017, 5:59 p.m.
Le 04/01/2017 à 09:50, Gerd Hoffmann a écrit :
> On Mi, 2016-12-28 at 04:55 +0900, OGAWA Hirofumi wrote:
>> 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/scancodes what I found in using.
>
> Added to ui queue.

Hi Gerd,

Your pull request (patch 01/11) contains v2 of this patch (which is incomplete).
I've only reviewed v3, which is complete.

Regards,

Hervé

Patch

diff -puN hw/input/ps2.c~fix-ps2-scancode hw/input/ps2.c
--- qemu/hw/input/ps2.c~fix-ps2-scancode	2016-12-23 23:51:44.324955949 +0900
+++ qemu-hirofumi/hw/input/ps2.c	2016-12-28 04:50:05.075057779 +0900
@@ -252,6 +252,9 @@  static const uint16_t qcode_to_keycode_s
     [Q_KEY_CODE_ASTERISK] = 0x37,
     [Q_KEY_CODE_LESS] = 0x56,
     [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,
 };
 
@@ -394,6 +397,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,
 };
 
@@ -504,6 +510,10 @@  static const uint16_t qcode_to_keycode_s
     [Q_KEY_CODE_COMMA] = 0x41,
     [Q_KEY_CODE_DOT] = 0x49,
     [Q_KEY_CODE_SLASH] = 0x4a,
+
+    [Q_KEY_CODE_HIRAGANA] = 0x87,
+    [Q_KEY_CODE_HENKAN] = 0x86,
+    [Q_KEY_CODE_YEN] = 0x5d,
 };
 
 static uint8_t translate_table[256] = {
diff -puN qapi-schema.json~fix-ps2-scancode qapi-schema.json
--- qemu/qapi-schema.json~fix-ps2-scancode	2016-12-23 23:51:44.324955949 +0900
+++ qemu-hirofumi/qapi-schema.json	2016-12-24 08:32:46.658549598 +0900
@@ -3618,6 +3618,9 @@ 
 # @kp_comma: since 2.4
 # @kp_equals: since 2.6
 # @power: since 2.6
+# @hiragana: since 2.9
+# @henkan: since 2.9
+# @yen: since 2.9
 #
 # An enumeration of key name.
 #
@@ -3642,7 +3645,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 23:51:44.325955954 +0900
+++ qemu-hirofumi/ui/input-keymap.c	2016-12-23 23:51:44.327955966 +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,