From patchwork Wed Aug 26 13:35:57 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 32153 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 1CAF1B70D7 for ; Wed, 26 Aug 2009 23:54:56 +1000 (EST) Received: from localhost ([127.0.0.1]:38070 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MgIiI-0007f4-D5 for incoming@patchwork.ozlabs.org; Wed, 26 Aug 2009 09:38:58 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MgIfX-0006vr-QI for qemu-devel@nongnu.org; Wed, 26 Aug 2009 09:36:07 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MgIfS-0006ss-Ns for qemu-devel@nongnu.org; Wed, 26 Aug 2009 09:36:07 -0400 Received: from [199.232.76.173] (port=42817 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MgIfS-0006sf-Gd for qemu-devel@nongnu.org; Wed, 26 Aug 2009 09:36:02 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46533) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MgIfR-0007wG-Sd for qemu-devel@nongnu.org; Wed, 26 Aug 2009 09:36:02 -0400 Received: from int-mx05.intmail.prod.int.phx2.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n7QDa075023855 for ; Wed, 26 Aug 2009 09:36:01 -0400 Received: from zweiblum.home.kraxel.org (vpn1-4-183.ams2.redhat.com [10.36.4.183]) by int-mx05.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id n7QDZwCX002830; Wed, 26 Aug 2009 09:35:59 -0400 Received: by zweiblum.home.kraxel.org (Postfix, from userid 500) id D8E1C700DF; Wed, 26 Aug 2009 15:35:57 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Wed, 26 Aug 2009 15:35:57 +0200 Message-Id: <1251293757-6007-4-git-send-email-kraxel@redhat.com> In-Reply-To: <1251293757-6007-1-git-send-email-kraxel@redhat.com> References: <1251293757-6007-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.18 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH 3/3] Move isa_connect_irq calls into isa_create_simple 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 Now with isa-bus maintaining the isa irqs we can move the isa_connect_irq() calls into isa_create_simple(). Signed-off-by: Gerd Hoffmann --- hw/fdc.c | 3 +-- hw/isa-bus.c | 7 ++++++- hw/isa.h | 3 ++- hw/pc.c | 4 +--- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/hw/fdc.c b/hw/fdc.c index 0ece6db..e5a650a 100644 --- a/hw/fdc.c +++ b/hw/fdc.c @@ -1878,9 +1878,8 @@ fdctrl_t *fdctrl_init_isa(int isairq, int dma_chann, fdctrl_t *fdctrl; ISADevice *dev; - dev = isa_create_simple("isa-fdc", io_base, 0); + dev = isa_create_simple("isa-fdc", io_base, 0, isairq, -1); fdctrl = &(DO_UPCAST(fdctrl_isabus_t, busdev, dev)->state); - isa_connect_irq(dev, 0, isairq); fdctrl->dma_chann = dma_chann; DMA_register_channel(dma_chann, &fdctrl_transfer_handler, fdctrl); diff --git a/hw/isa-bus.c b/hw/isa-bus.c index 4ac4fad..1ad5e40 100644 --- a/hw/isa-bus.c +++ b/hw/isa-bus.c @@ -121,7 +121,8 @@ void isa_qdev_register(ISADeviceInfo *info) qdev_register(&info->qdev); } -ISADevice *isa_create_simple(const char *name, uint32_t iobase, uint32_t iobase2) +ISADevice *isa_create_simple(const char *name, uint32_t iobase, uint32_t iobase2, + uint32_t irq, uint32 irq2) { DeviceState *dev; ISADevice *isa; @@ -135,6 +136,10 @@ ISADevice *isa_create_simple(const char *name, uint32_t iobase, uint32_t iobase2 isa->iobase[0] = iobase; isa->iobase[1] = iobase2; qdev_init(dev); + if (-1 != irq) + isa_connect_irq(isa, 0, irq); + if (-1 != irq2) + isa_connect_irq(isa, 1, irq2); return isa; } diff --git a/hw/isa.h b/hw/isa.h index 31853a0..872e3ef 100644 --- a/hw/isa.h +++ b/hw/isa.h @@ -30,7 +30,8 @@ void isa_connect_irq(ISADevice *dev, int devirq, int isairq); qemu_irq isa_reserve_irq(int isairq); void isa_init_irq(ISADevice *dev, qemu_irq *p); void isa_qdev_register(ISADeviceInfo *info); -ISADevice *isa_create_simple(const char *name, uint32_t iobase, uint32_t iobase2); +ISADevice *isa_create_simple(const char *name, uint32_t iobase, uint32_t iobase2, + uint32_t irq, uint32_t irq2); extern target_phys_addr_t isa_mem_base; diff --git a/hw/pc.c b/hw/pc.c index fc6a925..ab7ce20 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -1375,9 +1375,7 @@ static void pc_init1(ram_addr_t ram_size, } } - isa_dev = isa_create_simple("i8042", 0x60, 0x64); - isa_connect_irq(isa_dev, 0, 1); - isa_connect_irq(isa_dev, 1, 12); + isa_dev = isa_create_simple("i8042", 0x60, 0x64, 1, 12); DMA_init(0); #ifdef HAS_AUDIO audio_init(pci_enabled ? pci_bus : NULL, isa_irq);