@samitouri / QOSamiQemu / commits / 05a7da6d1c

hw/arm/musicpal: Use Linux key codes

QemuInputEvent now stores Linux key codes for key events. Use those codes directly instead of translating between internal key code representations. Signed-off-by: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp> Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> Message-ID: <20260520-input-v3-8-7c9e4c7abe34@rsg.ci.i.u-tokyo.ac.jp>

Akihiko Odaki committed May 20, 2026 at 15:47 UTC 05a7da6d1c9e6c9450c2c834d3293b94019a0e16
1 file changed +10 -10
hw/arm/musicpal.c
+10 -10
@@ -24,6 +24,7 @@
24 #include "hw/core/ptimer.h"
25 #include "hw/core/qdev-properties.h"
26 #include "hw/block/flash.h"
27 +#include "standard-headers/linux/input-event-codes.h"
28 #include "ui/console.h"
29 #include "hw/i2c/i2c.h"
30 #include "hw/i2c/bitbang_i2c.h"
@@ -1069,40 +1070,39 @@ static void musicpal_key_event(DeviceState *dev, QemuConsole *src,
1070 QemuInputEvent *evt)
1071 {
1072 musicpal_key_state *s = MUSICPAL_KEY(dev);
1072 - int qcode = qemu_input_linux_to_qcode(evt->key.key);
1073 uint32_t event = 0;
1074 int i;
1075
1076 - switch (qcode) {
1077 - case Q_KEY_CODE_UP:
1076 + switch (evt->key.key) {
1077 + case KEY_UP:
1078 event = MP_KEY_WHEEL_NAV | MP_KEY_WHEEL_NAV_INV;
1079 break;
1080
1081 - case Q_KEY_CODE_DOWN:
1081 + case KEY_DOWN:
1082 event = MP_KEY_WHEEL_NAV;
1083 break;
1084
1085 - case Q_KEY_CODE_LEFT:
1085 + case KEY_LEFT:
1086 event = MP_KEY_WHEEL_VOL | MP_KEY_WHEEL_VOL_INV;
1087 break;
1088
1089 - case Q_KEY_CODE_RIGHT:
1089 + case KEY_RIGHT:
1090 event = MP_KEY_WHEEL_VOL;
1091 break;
1092
1093 - case Q_KEY_CODE_F:
1093 + case KEY_F:
1094 event = MP_KEY_BTN_FAVORITS;
1095 break;
1096
1097 - case Q_KEY_CODE_TAB:
1097 + case KEY_TAB:
1098 event = MP_KEY_BTN_VOLUME;
1099 break;
1100
1101 - case Q_KEY_CODE_RET:
1101 + case KEY_ENTER:
1102 event = MP_KEY_BTN_NAVIGATION;
1103 break;
1104
1105 - case Q_KEY_CODE_M:
1105 + case KEY_M:
1106 event = MP_KEY_BTN_MENU;
1107 break;
1108 }