From patchwork Wed Mar 13 08:01:19 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: liguang X-Patchwork-Id: 227196 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 9EF302C029A for ; Wed, 13 Mar 2013 19:44:54 +1100 (EST) Received: from localhost ([::1]:48586 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UFgi0-0005qE-KB for incoming@patchwork.ozlabs.org; Wed, 13 Mar 2013 04:06:48 -0400 Received: from eggs.gnu.org ([208.118.235.92]:34383) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UFgeP-0007XW-Pp for qemu-devel@nongnu.org; Wed, 13 Mar 2013 04:03:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UFgeJ-0001ot-Eh for qemu-devel@nongnu.org; Wed, 13 Mar 2013 04:03:05 -0400 Received: from [222.73.24.84] (port=34800 helo=song.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UFgeJ-0001jo-13 for qemu-devel@nongnu.org; Wed, 13 Mar 2013 04:02:59 -0400 X-IronPort-AV: E=Sophos;i="4.84,834,1355068800"; d="scan'208";a="6864301" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 13 Mar 2013 16:00:25 +0800 Received: from fnstmail02.fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id r2D82oDd010002 for ; Wed, 13 Mar 2013 16:02:51 +0800 Received: from liguang.fnst.cn.fujitsu.com ([10.167.233.147]) by fnstmail02.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.3) with ESMTP id 2013031316013632-831308 ; Wed, 13 Mar 2013 16:01:36 +0800 From: liguang To: qemu-devel@nongnu.org Date: Wed, 13 Mar 2013 16:01:19 +0800 Message-Id: <1363161681-13878-13-git-send-email-lig.fnst@cn.fujitsu.com> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1363161681-13878-1-git-send-email-lig.fnst@cn.fujitsu.com> References: <1363161681-13878-1-git-send-email-lig.fnst@cn.fujitsu.com> X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/03/13 16:01:36, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/03/13 16:01:37, Serialize complete at 2013/03/13 16:01:37 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 222.73.24.84 Cc: liguang Subject: [Qemu-devel] [PATCH][RFC 12/14] ps2: call ps2_{kbd, mouse}_reset in kbd_reset X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: liguang --- hw/pckbd.c | 3 +++ hw/ps2.c | 8 ++++---- hw/ps2.h | 2 ++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/hw/pckbd.c b/hw/pckbd.c index 1ab8ada..f2570d8 100644 --- a/hw/pckbd.c +++ b/hw/pckbd.c @@ -374,6 +374,9 @@ static void kbd_reset(DeviceState *dev) s->mode = KBD_MODE_KBD_INT | KBD_MODE_MOUSE_INT; s->status = KBD_STAT_CMD | KBD_STAT_UNLOCKED; s->outport = KBD_OUT_RESET | KBD_OUT_A20; + + ps2_kbd_reset(s->kbd); + ps2_mouse_reset(s->mouse); } static const VMStateDescription vmstate_kbd = { diff --git a/hw/ps2.c b/hw/ps2.c index 15cfd5b..36d431e 100644 --- a/hw/ps2.c +++ b/hw/ps2.c @@ -528,7 +528,7 @@ static void ps2_common_reset(PS2State *s) s->update_irq(s->update_arg, 0); } -static void ps2_kbd_reset(void *opaque) +void ps2_kbd_reset(void *opaque) { PS2KbdState *s = (PS2KbdState *) opaque; @@ -538,7 +538,7 @@ static void ps2_kbd_reset(void *opaque) s->scancode_set = 0; } -static void ps2_mouse_reset(void *opaque) +void ps2_mouse_reset(void *opaque) { PS2MouseState *s = (PS2MouseState *) opaque; @@ -659,7 +659,7 @@ void *ps2_kbd_init(void (*update_irq)(void *, int), void *update_arg) s->scancode_set = 2; vmstate_register(NULL, 0, &vmstate_ps2_keyboard, s); qemu_add_kbd_event_handler(ps2_put_keycode, s); - qemu_register_reset(ps2_kbd_reset, s); + return s; } @@ -671,6 +671,6 @@ void *ps2_mouse_init(void (*update_irq)(void *, int), void *update_arg) s->common.update_arg = update_arg; vmstate_register(NULL, 0, &vmstate_ps2_mouse, s); qemu_add_mouse_event_handler(ps2_mouse_event, s, 0, "QEMU PS/2 Mouse"); - qemu_register_reset(ps2_mouse_reset, s); + return s; } diff --git a/hw/ps2.h b/hw/ps2.h index 7c45ce7..3e65d47 100644 --- a/hw/ps2.h +++ b/hw/ps2.h @@ -34,5 +34,7 @@ uint32_t ps2_read_data(void *); void ps2_queue(void *, int b); void ps2_keyboard_set_translation(void *opaque, int mode); void ps2_mouse_fake_event(void *opaque); +void ps2_kbd_reset(void *opaque); +void ps2_mouse_reset(void *opaque); #endif /* !HW_PS2_H */