From patchwork Fri Aug 28 11:56:37 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Weil X-Patchwork-Id: 32357 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 bilbo.ozlabs.org (Postfix) with ESMTPS id CD803B7BCB for ; Fri, 28 Aug 2009 21:57:47 +1000 (EST) Received: from localhost ([127.0.0.1]:36310 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mh05O-0006Yk-Jw for incoming@patchwork.ozlabs.org; Fri, 28 Aug 2009 07:57:42 -0400 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 Received: from flocke.weilnetz.de (p54ADF348.dip.t-dialin.net [84.173.243.72]) by mrelayeu.kundenserver.de (node=mreu2) with ESMTP (Nemesis) id 0MKv5w-1Mh04M0vYV-0004YS; Fri, 28 Aug 2009 13:56:38 +0200 Received: from stefan by flocke.weilnetz.de with local (Exim 4.69) (envelope-from ) id 1Mh04L-00030B-Cg; Fri, 28 Aug 2009 13:56:37 +0200 From: Stefan Weil To: QEMU Developers Date: Fri, 28 Aug 2009 13:56:37 +0200 Message-Id: <1251460597-11518-1-git-send-email-weil@mail.berlios.de> X-Mailer: git-send-email 1.5.6.5 In-Reply-To: <4A97C3B4.8030006@mail.berlios.de> References: <4A97C3B4.8030006@mail.berlios.de> X-Provags-ID: V01U2FsdGVkX195wf+UYb/huHYeFrMA6InY9L5f84x7CeTcMPo /bx0zoba3MoGtRabP179ciZDR3ofZ19TDPY+01LSgx/+fdpr76 ge/htpcGz+AD1t3GWCU5Bd9mGtITugxWL8KyRVMHxdx+ETY150 w4Q== X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Subject: [Qemu-devel] [PATCH] mips malta: Use qdev for i8042 setup 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 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]);