From patchwork Tue Jun 7 15:02:54 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 99275 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id BADD5B6FA3 for ; Wed, 8 Jun 2011 01:46:15 +1000 (EST) Received: from localhost ([::1]:42307 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QTyTs-0003iN-05 for incoming@patchwork.ozlabs.org; Tue, 07 Jun 2011 11:46:12 -0400 Received: from eggs.gnu.org ([140.186.70.92]:49175) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QTxoU-0001iS-Eg for qemu-devel@nongnu.org; Tue, 07 Jun 2011 11:03:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QTxo8-0000Pi-L6 for qemu-devel@nongnu.org; Tue, 07 Jun 2011 11:03:25 -0400 Received: from fmmailgate03.web.de ([217.72.192.234]:35591) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QTxo7-0000Op-Tz for qemu-devel@nongnu.org; Tue, 07 Jun 2011 11:03:04 -0400 Received: from smtp01.web.de ( [172.20.0.243]) by fmmailgate03.web.de (Postfix) with ESMTP id 29AEF191BC22F; Tue, 7 Jun 2011 17:03:03 +0200 (CEST) Received: from [87.173.124.210] (helo=af.local) by smtp01.web.de with asmtp (WEB.DE 4.110 #2) id 1QTxo6-0006hT-01; Tue, 07 Jun 2011 17:03:02 +0200 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Tue, 7 Jun 2011 17:02:54 +0200 Message-Id: <1307458978-51287-7-git-send-email-andreas.faerber@web.de> X-Mailer: git-send-email 1.7.5.3 In-Reply-To: <1307458978-51287-6-git-send-email-andreas.faerber@web.de> References: <4DEDD0BA.1080407@redhat.com> <1307458978-51287-1-git-send-email-andreas.faerber@web.de> <1307458978-51287-2-git-send-email-andreas.faerber@web.de> <1307458978-51287-3-git-send-email-andreas.faerber@web.de> <1307458978-51287-4-git-send-email-andreas.faerber@web.de> <1307458978-51287-5-git-send-email-andreas.faerber@web.de> <1307458978-51287-6-git-send-email-andreas.faerber@web.de> MIME-Version: 1.0 X-Sender: Andreas.Faerber@web.de X-Provags-ID: V01U2FsdGVkX195bxyMQy2uYkxoTcyxt+obzlAu79aoT27RlpAs CB6L/ukF0syP070uPxEQxS5vShv2PTk+dQ7AcXi5d9h77Q89XY NOf8PHALKHiTYhdm7oQA== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 X-Received-From: 217.72.192.234 Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= , hpoussin@reactos.org, kraxel@redhat.com, Markus Armbruster Subject: [Qemu-devel] [PATCH v2 06/10] fdc: Parametrize ISA base, IRQ and DMA 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 From: Hervé Poussineau Keep the PC values as defaults but allow to override them for PReP. Signed-off-by: Hervé Poussineau Cc: Markus Armbruster Signed-off-by: Andreas Färber --- hw/fdc.c | 27 +++++++++++++++------------ 1 files changed, 15 insertions(+), 12 deletions(-) diff --git a/hw/fdc.c b/hw/fdc.c index edf0360..f4e3e0d 100644 --- a/hw/fdc.c +++ b/hw/fdc.c @@ -425,6 +425,9 @@ typedef struct FDCtrlSysBus { typedef struct FDCtrlISABus { ISADevice busdev; + uint32_t iobase; + uint32_t irq; + uint32_t dma; struct FDCtrl state; int32_t bootindexA; int32_t bootindexB; @@ -1895,26 +1898,23 @@ static int isabus_fdc_init1(ISADevice *dev) { FDCtrlISABus *isa = DO_UPCAST(FDCtrlISABus, busdev, dev); FDCtrl *fdctrl = &isa->state; - int iobase = 0x3f0; - int isairq = 6; - int dma_chann = 2; int ret; - register_ioport_read(iobase + 0x01, 5, 1, + register_ioport_read(isa->iobase + 0x01, 5, 1, &fdctrl_read_port, fdctrl); - register_ioport_read(iobase + 0x07, 1, 1, + register_ioport_read(isa->iobase + 0x07, 1, 1, &fdctrl_read_port, fdctrl); - register_ioport_write(iobase + 0x01, 5, 1, + register_ioport_write(isa->iobase + 0x01, 5, 1, &fdctrl_write_port, fdctrl); - register_ioport_write(iobase + 0x07, 1, 1, + register_ioport_write(isa->iobase + 0x07, 1, 1, &fdctrl_write_port, fdctrl); - isa_init_ioport_range(dev, iobase, 6); - isa_init_ioport(dev, iobase + 7); + isa_init_ioport_range(dev, isa->iobase, 6); + isa_init_ioport(dev, isa->iobase + 7); - isa_init_irq(&isa->busdev, &fdctrl->irq, isairq); - fdctrl->dma_chann = dma_chann; + isa_init_irq(&isa->busdev, &fdctrl->irq, isa->irq); + fdctrl->dma_chann = isa->dma; - qdev_set_legacy_instance_id(&dev->qdev, iobase, 2); + qdev_set_legacy_instance_id(&dev->qdev, isa->iobase, 2); ret = fdctrl_init_common(fdctrl); add_boot_device_path(isa->bootindexA, &dev->qdev, "/floppy@0"); @@ -1979,6 +1979,9 @@ static ISADeviceInfo isa_fdc_info = { .qdev.vmsd = &vmstate_isa_fdc, .qdev.reset = fdctrl_external_reset_isa, .qdev.props = (Property[]) { + DEFINE_PROP_HEX32("iobase", FDCtrlISABus, iobase, 0x3f0), + DEFINE_PROP_UINT32("irq", FDCtrlISABus, irq, 6), + DEFINE_PROP_UINT32("dma", FDCtrlISABus, dma, 2), DEFINE_PROP_DRIVE("driveA", FDCtrlISABus, state.drives[0].bs), DEFINE_PROP_DRIVE("driveB", FDCtrlISABus, state.drives[1].bs), DEFINE_PROP_INT32("bootindexA", FDCtrlISABus, bootindexA, -1),