[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2/6] hid: register kbd hander in init()
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 2/6] hid: register kbd hander in init() |
Date: |
Thu, 11 Aug 2011 09:03:41 +0200 |
From: Michael Walle <address@hidden>
Register the keyboard event handler in hid's init() instead of its reset()
function.
Signed-off-by: Michael Walle <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/hid.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/hw/hid.c b/hw/hid.c
index 77339f7..3dc4246 100644
--- a/hw/hid.c
+++ b/hw/hid.c
@@ -364,7 +364,6 @@ void hid_reset(HIDState *hs)
{
switch (hs->kind) {
case HID_KEYBOARD:
- qemu_add_kbd_event_handler(hid_keyboard_event, hs);
memset(hs->kbd.keycodes, 0, sizeof(hs->kbd.keycodes));
memset(hs->kbd.key, 0, sizeof(hs->kbd.key));
hs->kbd.keys = 0;
@@ -398,7 +397,9 @@ void hid_init(HIDState *hs, int kind, HIDEventFunc event)
hs->kind = kind;
hs->event = event;
- if (hs->kind == HID_MOUSE) {
+ if (hs->kind == HID_KEYBOARD) {
+ qemu_add_kbd_event_handler(hid_keyboard_event, hs);
+ } else if (hs->kind == HID_MOUSE) {
hs->ptr.eh_entry = qemu_add_mouse_event_handler(hid_pointer_event, hs,
0, "QEMU HID Mouse");
} else if (hs->kind == HID_TABLET) {
--
1.7.1
- [Qemu-devel] [PULL] usb patch queue, Gerd Hoffmann, 2011/08/11
- [Qemu-devel] [PATCH 4/6] usb-hid: use hid vmstate macro, Gerd Hoffmann, 2011/08/11
- [Qemu-devel] [PATCH 3/6] hid: introduce hid vmstate macros, Gerd Hoffmann, 2011/08/11
- [Qemu-devel] [PATCH 1/6] usb/hid: add hid_pointer_activate, use it, Gerd Hoffmann, 2011/08/11
- [Qemu-devel] [PATCH 5/6] milkymist-softusb: use hid code directly, Gerd Hoffmann, 2011/08/11
- [Qemu-devel] [PATCH 2/6] hid: register kbd hander in init(),
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 6/6] usb-hid: remove usb_hid_datain_cb, Gerd Hoffmann, 2011/08/11
- Re: [Qemu-devel] [PULL] usb patch queue, Michael Tokarev, 2011/08/12
- Re: [Qemu-devel] [PULL] usb patch queue, Anthony Liguori, 2011/08/12