From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Mh04X-0006Ye-2F for qemu-devel@nongnu.org; Fri, 28 Aug 2009 07:56:49 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Mh04R-0006Xc-Gj for qemu-devel@nongnu.org; Fri, 28 Aug 2009 07:56:47 -0400 Received: from [199.232.76.173] (port=47396 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mh04O-0006XK-D0 for qemu-devel@nongnu.org; Fri, 28 Aug 2009 07:56:40 -0400 Received: from moutng.kundenserver.de ([212.227.126.186]:58924) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Mh04N-0001bv-Pb for qemu-devel@nongnu.org; Fri, 28 Aug 2009 07:56:40 -0400 From: Stefan Weil Date: Fri, 28 Aug 2009 13:56:37 +0200 Message-Id: <1251460597-11518-1-git-send-email-weil@mail.berlios.de> In-Reply-To: <4A97C3B4.8030006@mail.berlios.de> References: <4A97C3B4.8030006@mail.berlios.de> Subject: [Qemu-devel] [PATCH] mips malta: Use qdev for i8042 setup List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: QEMU Developers This is just a copy of similar changes which were applied to pc.c. Signed-off-by: Stefan Weil --- hw/mips_malta.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/hw/mips_malta.c b/hw/mips_malta.c index a70d79e..23c257a 100644 --- a/hw/mips_malta.c +++ b/hw/mips_malta.c @@ -765,6 +765,7 @@ void mips_malta_init (ram_addr_t ram_size, target_long bios_size; int64_t kernel_entry; PCIBus *pci_bus; + ISADevice *isa_dev; CPUState *env; RTCState *rtc_state; fdctrl_t *floppy_controller; @@ -920,7 +921,8 @@ void mips_malta_init (ram_addr_t ram_size, DMA_init(0); /* Super I/O */ - i8042_init(i8259[1], i8259[12], 0x60); + isa_dev = isa_create_simple("i8042", 0x60, 0x64, 1, 12); + rtc_state = rtc_init(0x70, i8259[8], 2000); serial_init(0x3f8, i8259[4], 115200, serial_hds[0]); serial_init(0x2f8, i8259[3], 115200, serial_hds[1]); -- 1.5.6.5