From: don.hong <don.hong@samsung.com>
Date: Fri, 6 Apr 2012 09:01:27 +0000 (+0900)
Subject: [Title] Fixed not to register usb keyboard handler when initializing ps2 keyboard
X-Git-Tag: TizenStudio_2.0_p2.3~1539
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6753a04ec1a18005633d342cf3b714e0ed45f5e1;p=sdk%2Femulator%2Fqemu.git

[Title] Fixed not to register usb keyboard handler when initializing ps2 keyboard
[Type] BugFix
[Module]
[Priority]
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]
---

diff --git a/hw/ps2.c b/hw/ps2.c
index ba02a11..beb2292 100644
--- a/hw/ps2.c
+++ b/hw/ps2.c
@@ -652,9 +652,10 @@ 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);
 #ifdef CONFIG_MARU
     qemu_add_ps2kbd_event_handler(ps2_put_keycode, s);
+#else
+    qemu_add_kbd_event_handler(ps2_put_keycode, s);
 #endif
     qemu_register_reset(ps2_kbd_reset, s);
     return s;