[Qemu-devel] [PULL 15/45] adb.c: correct several key assignments

[David Gibson]

From: John Arbuckle <address@hidden>

The original pc_to_adb_keycode mapping did have several keys that were
incorrectly mapped. This patch fixes these mappings.

Signed-off-by: John Arbuckle <address@hidden>
Signed-off-by: David Gibson <address@hidden>
---
 hw/input/adb.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/hw/input/adb.c b/hw/input/adb.c
index 18c220b..12c6333 100644
--- a/hw/input/adb.c
+++ b/hw/input/adb.c
@@ -196,7 +196,7 @@ int qcode_to_adb_keycode[] = {
     [Q_KEY_CODE_SHIFT_R]       = ADB_KEY_RIGHT_SHIFT,
     [Q_KEY_CODE_ALT]           = ADB_KEY_LEFT_OPTION,
     [Q_KEY_CODE_ALT_R]         = ADB_KEY_RIGHT_OPTION,
-    [Q_KEY_CODE_ALTGR]         = 0,
+    [Q_KEY_CODE_ALTGR]         = ADB_KEY_RIGHT_OPTION,
     [Q_KEY_CODE_CTRL]          = ADB_KEY_LEFT_CONTROL,
     [Q_KEY_CODE_CTRL_R]        = ADB_KEY_RIGHT_CONTROL,
     [Q_KEY_CODE_META_L]        = ADB_KEY_COMMAND,
@@ -269,13 +269,13 @@ int qcode_to_adb_keycode[] = {
     [Q_KEY_CODE_F10]           = ADB_KEY_F10,
     [Q_KEY_CODE_F11]           = ADB_KEY_F11,
     [Q_KEY_CODE_F12]           = ADB_KEY_F12,
-    [Q_KEY_CODE_PRINT]         = 0,
-    [Q_KEY_CODE_SYSRQ]         = 0,
+    [Q_KEY_CODE_PRINT]         = ADB_KEY_F13,
+    [Q_KEY_CODE_SYSRQ]         = ADB_KEY_F13,
     [Q_KEY_CODE_SCROLL_LOCK]   = ADB_KEY_F14,
-    [Q_KEY_CODE_PAUSE]         = 0,
+    [Q_KEY_CODE_PAUSE]         = ADB_KEY_F15,
 
     [Q_KEY_CODE_NUM_LOCK]      = ADB_KEY_KP_CLEAR,
-    [Q_KEY_CODE_KP_EQUALS]     = 0,
+    [Q_KEY_CODE_KP_EQUALS]     = ADB_KEY_KP_EQUAL,
     [Q_KEY_CODE_KP_DIVIDE]     = ADB_KEY_KP_DIVIDE,
     [Q_KEY_CODE_KP_MULTIPLY]   = ADB_KEY_KP_MULTIPLY,
     [Q_KEY_CODE_KP_SUBTRACT]   = ADB_KEY_KP_SUBTRACT,
@@ -298,7 +298,7 @@ int qcode_to_adb_keycode[] = {
     [Q_KEY_CODE_LEFT]          = ADB_KEY_LEFT,
     [Q_KEY_CODE_RIGHT]         = ADB_KEY_RIGHT,
 
-    [Q_KEY_CODE_HELP]          = 0,
+    [Q_KEY_CODE_HELP]          = ADB_KEY_HELP,
     [Q_KEY_CODE_INSERT]        = ADB_KEY_HELP,
     [Q_KEY_CODE_DELETE]        = ADB_KEY_FORWARD_DELETE,
     [Q_KEY_CODE_HOME]          = ADB_KEY_HOME,
-- 
2.7.4