From patchwork Sun Aug 1 17:37:08 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Herv=C3=A9_Poussineau?= X-Patchwork-Id: 60476 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 3064C1007D1 for ; Mon, 2 Aug 2010 04:18:57 +1000 (EST) Received: from localhost ([127.0.0.1]:52070 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ofd7a-0002HP-8t for incoming@patchwork.ozlabs.org; Sun, 01 Aug 2010 14:18:50 -0400 Received: from [140.186.70.92] (port=41805 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ofczz-0006rk-Oc for qemu-devel@nongnu.org; Sun, 01 Aug 2010 14:11:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Ofczy-0005vT-5a for qemu-devel@nongnu.org; Sun, 01 Aug 2010 14:10:59 -0400 Received: from smtp5-g21.free.fr ([212.27.42.5]:43235) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Ofczx-0005v6-Ct for qemu-devel@nongnu.org; Sun, 01 Aug 2010 14:10:58 -0400 Received: from localhost.localdomain (unknown [88.171.126.33]) by smtp5-g21.free.fr (Postfix) with ESMTP id 2EDD9D48074; Sun, 1 Aug 2010 20:10:51 +0200 (CEST) From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= To: qemu-devel@nongnu.org Date: Sun, 1 Aug 2010 19:37:08 +0200 Message-Id: <1280684242-19611-6-git-send-email-hpoussin@reactos.org> X-Mailer: git-send-email 1.7.1.GIT In-Reply-To: <4C5579DA.8050508@reactos.org> References: <4C5579DA.8050508@reactos.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Subject: [Qemu-devel] [PATCH 06/20] [MIPS] qdev: convert i8042 to rc4030 device X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Use it in Jazz emulation Remove i8042_mm_init() function, which is not used anymore Signed-off-by: Hervé Poussineau --- hw/mips_jazz.c | 2 +- hw/pc.h | 3 -- hw/pckbd.c | 65 ++++++++++++++++++++++++++++++++++++++----------------- 3 files changed, 46 insertions(+), 24 deletions(-) diff --git a/hw/mips_jazz.c b/hw/mips_jazz.c index c000fd3..9663a3c 100644 --- a/hw/mips_jazz.c +++ b/hw/mips_jazz.c @@ -252,7 +252,7 @@ void mips_jazz_init (ram_addr_t ram_size, cpu_register_physical_memory(0x80004000, 0x00001000, s_rtc); /* Keyboard (i8042) */ - i8042_mm_init(rc4030[6], rc4030[7], 0x80005000, 0x1000, 0x1); + rc4030_create_simple("rc4030-i8042"); /* Serial ports */ if (serial_hds[0]) { diff --git a/hw/pc.h b/hw/pc.h index 63b0249..e078fd9 100644 --- a/hw/pc.h +++ b/hw/pc.h @@ -74,9 +74,6 @@ void *vmmouse_init(void *m); /* pckbd.c */ void i8042_init(qemu_irq kbd_irq, qemu_irq mouse_irq, uint32_t io_base); -void i8042_mm_init(qemu_irq kbd_irq, qemu_irq mouse_irq, - target_phys_addr_t base, ram_addr_t size, - target_phys_addr_t mask); void i8042_isa_mouse_fake_event(void *opaque); void i8042_setup_a20_line(ISADevice *dev, qemu_irq *a20_out); diff --git a/hw/pckbd.c b/hw/pckbd.c index 0533b1d..c422a78 100644 --- a/hw/pckbd.c +++ b/hw/pckbd.c @@ -26,6 +26,8 @@ #include "pc.h" #include "ps2.h" #include "sysemu.h" +#include "rc4030.h" +#include "qdev-addr.h" /* debug PC keyboard */ //#define DEBUG_KBD @@ -407,26 +409,6 @@ static CPUWriteMemoryFunc * const kbd_mm_write[] = { &kbd_mm_writeb, }; -void i8042_mm_init(qemu_irq kbd_irq, qemu_irq mouse_irq, - target_phys_addr_t base, ram_addr_t size, - target_phys_addr_t mask) -{ - KBDState *s = qemu_mallocz(sizeof(KBDState)); - int s_io_memory; - - s->irq_kbd = kbd_irq; - s->irq_mouse = mouse_irq; - s->mask = mask; - - vmstate_register(NULL, 0, &vmstate_kbd, s); - s_io_memory = cpu_register_io_memory(kbd_mm_read, kbd_mm_write, s); - cpu_register_physical_memory(base, size, s_io_memory); - - s->kbd = ps2_kbd_init(kbd_update_kbd_irq, s); - s->mouse = ps2_mouse_init(kbd_update_aux_irq, s); - qemu_register_reset(kbd_reset, s); -} - typedef struct ISAKBDState { ISADevice dev; KBDState kbd; @@ -486,8 +468,51 @@ static ISADeviceInfo i8042_info = { .init = i8042_initfn, }; +typedef struct RC4030KBDState { + RC4030Device dev; + target_phys_addr_t iobase; + uint32_t size; + uint32_t irq_kbd; + uint32_t irq_aux; + KBDState kbd; +} RC4030KBDState; + +static int i8042_rc4030_initfn(RC4030Device *dev) +{ + RC4030KBDState *rc4030 = DO_UPCAST(RC4030KBDState, dev, dev); + KBDState *s = &rc4030->kbd; + int s_io; + + rc4030_init_irq(dev, &s->irq_kbd, rc4030->irq_kbd); + rc4030_init_irq(dev, &s->irq_mouse, rc4030->irq_aux); + + s_io = cpu_register_io_memory(kbd_mm_read, kbd_mm_write, s); + cpu_register_physical_memory(rc4030->iobase, rc4030->size, s_io); + + s->kbd = ps2_kbd_init(kbd_update_kbd_irq, s); + s->mouse = ps2_mouse_init(kbd_update_aux_irq, s); + qemu_register_reset(kbd_reset, s); + + return 0; +} + +static RC4030DeviceInfo i8042_rc4030_info = { + .qdev.name = "rc4030-i8042", + .qdev.size = sizeof(RC4030KBDState), + .init = i8042_rc4030_initfn, + .qdev.props = (Property[]) { + DEFINE_PROP_TADDR("iobase", RC4030KBDState, iobase, 0x80005000), + DEFINE_PROP_HEX32("size", RC4030KBDState, size, 0x1000), + DEFINE_PROP_TADDR("mask", RC4030KBDState, kbd.mask, 0x1), + DEFINE_PROP_UINT32("irq_kbd", RC4030KBDState, irq_kbd, 6), + DEFINE_PROP_UINT32("irq_aux", RC4030KBDState, irq_aux, 7), + DEFINE_PROP_END_OF_LIST(), + }, +}; + static void i8042_register(void) { isa_qdev_register(&i8042_info); + rc4030_qdev_register(&i8042_rc4030_info); } device_init(i8042_register)