[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 5/5] ps2: do not generate invalid key codes for unkn
From: |
Hervé Poussineau |
Subject: |
[Qemu-devel] [PATCH 5/5] ps2: do not generate invalid key codes for unknown keys |
Date: |
Wed, 14 Sep 2016 23:57:45 +0200 |
Instead, print a warning message.
Signed-off-by: Hervé Poussineau <address@hidden>
---
hw/input/ps2.c | 19 ++++++-------------
1 file changed, 6 insertions(+), 13 deletions(-)
diff --git a/hw/input/ps2.c b/hw/input/ps2.c
index 3d7205d..5acd3ed 100644
--- a/hw/input/ps2.c
+++ b/hw/input/ps2.c
@@ -605,7 +605,8 @@ static void ps2_keyboard_event(DeviceState *dev,
QemuConsole *src,
}
ps2_put_keycode(s, keycode & 0xff);
} else {
- ps2_queue(&s->common, key->down ? 0x00 : 0x80);
+ qemu_log_mask(LOG_UNIMP,
+ "ps2: ignoring key with qcode %d\n", qcode);
}
}
} else if (s->scancode_set == 2) {
@@ -644,13 +645,9 @@ static void ps2_keyboard_event(DeviceState *dev,
QemuConsole *src,
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);
+ qemu_log_mask(LOG_UNIMP,
+ "ps2: ignoring key with qcode %d\n", qcode);
}
}
} else if (s->scancode_set == 3) {
@@ -661,13 +658,9 @@ static void ps2_keyboard_event(DeviceState *dev,
QemuConsole *src,
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);
+ qemu_log_mask(LOG_UNIMP,
+ "ps2: ignoring key with qcode %d\n", qcode);
}
}
}
--
2.1.4
- [Qemu-devel] [PATCH 0/5] ps2: fix keyboard set 3 and misc improvements, Hervé Poussineau, 2016/09/14
- [Qemu-devel] [PATCH 1/5] ps2: reject unknown commands, instead of blindly accepting them, Hervé Poussineau, 2016/09/14
- [Qemu-devel] [PATCH 3/5] ps2: allow keycode translation for all scancode sets, Hervé Poussineau, 2016/09/14
- [Qemu-devel] [PATCH 5/5] ps2: do not generate invalid key codes for unknown keys,
Hervé Poussineau <=
- [Qemu-devel] [PATCH 2/5] ps2: correctly handle 'get/set scancode' command, Hervé Poussineau, 2016/09/14
- [Qemu-devel] [PATCH 4/5] ps2: use QEMU qcodes instead of scancodes, Hervé Poussineau, 2016/09/14
- Re: [Qemu-devel] [PATCH 0/5] ps2: fix keyboard set 3 and misc improvements, no-reply, 2016/09/14
- Re: [Qemu-devel] [PATCH 0/5] ps2: fix keyboard set 3 and misc improvements, no-reply, 2016/09/14
- Re: [Qemu-devel] [PATCH 0/5] ps2: fix keyboard set 3 and misc improvements, Gerd Hoffmann, 2016/09/15