[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 05/10] input: switch ps/2 kbd to new input api
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 05/10] input: switch ps/2 kbd to new input api |
Date: |
Fri, 16 May 2014 08:47:26 +0200 |
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/input/ps2.c | 25 ++++++++++++++++++++++++-
1 file changed, 24 insertions(+), 1 deletion(-)
diff --git a/hw/input/ps2.c b/hw/input/ps2.c
index 9a016eb..9347a85 100644
--- a/hw/input/ps2.c
+++ b/hw/input/ps2.c
@@ -24,6 +24,7 @@
#include "hw/hw.h"
#include "hw/input/ps2.h"
#include "ui/console.h"
+#include "ui/input.h"
#include "sysemu/sysemu.h"
/* debug PC keyboard */
@@ -172,6 +173,21 @@ static void ps2_put_keycode(void *opaque, int keycode)
ps2_queue(&s->common, keycode);
}
+static void ps2_keyboard_event(DeviceState *dev, QemuConsole *src,
+ InputEvent *evt)
+{
+ PS2KbdState *s = (PS2KbdState *)dev;
+ int scancodes[3], i, count;
+
+ qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER);
+ count = qemu_input_key_value_to_scancode(evt->key->key,
+ evt->key->down,
+ scancodes);
+ for (i = 0; i < count; i++) {
+ ps2_put_keycode(s, scancodes[i]);
+ }
+}
+
uint32_t ps2_read_data(void *opaque)
{
PS2State *s = (PS2State *)opaque;
@@ -712,6 +728,12 @@ static const VMStateDescription vmstate_ps2_mouse = {
}
};
+static QemuInputHandler ps2_keyboard_handler = {
+ .name = "QEMU PS/2 Keyboard",
+ .mask = INPUT_EVENT_MASK_KEY,
+ .event = ps2_keyboard_event,
+};
+
void *ps2_kbd_init(void (*update_irq)(void *, int), void *update_arg)
{
PS2KbdState *s = (PS2KbdState *)g_malloc0(sizeof(PS2KbdState));
@@ -720,7 +742,8 @@ void *ps2_kbd_init(void (*update_irq)(void *, int), void
*update_arg)
s->common.update_arg = update_arg;
s->scancode_set = 2;
vmstate_register(NULL, 0, &vmstate_ps2_keyboard, s);
- qemu_add_kbd_event_handler(ps2_put_keycode, s);
+ qemu_input_handler_register((DeviceState *)s,
+ &ps2_keyboard_handler);
qemu_register_reset(ps2_kbd_reset, s);
return s;
}
--
1.8.3.1
- [Qemu-devel] [PULL 00/10] input layer rework continued, Gerd Hoffmann, 2014/05/16
- [Qemu-devel] [PULL 10/10] input: sparc32 kbd: claim en-us layout, Gerd Hoffmann, 2014/05/16
- [Qemu-devel] [PULL 09/10] input: sparc32 kbd: fix some key mappings, Gerd Hoffmann, 2014/05/16
- [Qemu-devel] [PULL 01/10] ps2: set ps/2 output buffer size as the same as kernel, Gerd Hoffmann, 2014/05/16
- [Qemu-devel] [PULL 08/10] input: remove sparc keymap hack, Gerd Hoffmann, 2014/05/16
- [Qemu-devel] [PULL 02/10] input: key mapping helpers, Gerd Hoffmann, 2014/05/16
- [Qemu-devel] [PULL 06/10] input: switch ps/2 mouse to new input api, Gerd Hoffmann, 2014/05/16
- [Qemu-devel] [PULL 05/10] input: switch ps/2 kbd to new input api,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 07/10] input: switch sparc32 kbd to new input api, Gerd Hoffmann, 2014/05/16
- [Qemu-devel] [PULL 03/10] input: add qemu_input_handler_deactivate, Gerd Hoffmann, 2014/05/16
- [Qemu-devel] [PULL 04/10] input: use KeyValue directly in sendkey monitor command, Gerd Hoffmann, 2014/05/16
- Re: [Qemu-devel] [PULL 00/10] input layer rework continued, Olivier Danet, 2014/05/18
- Re: [Qemu-devel] [PULL 00/10] input layer rework continued, Peter Maydell, 2014/05/19