From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:58617) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QTcZm-0002cA-Rk for qemu-devel@nongnu.org; Mon, 06 Jun 2011 12:22:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QTcZg-00037A-Ly for qemu-devel@nongnu.org; Mon, 06 Jun 2011 12:22:50 -0400 Received: from fmmailgate03.web.de ([217.72.192.234]:41116) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QTcZe-00036V-Tn for qemu-devel@nongnu.org; Mon, 06 Jun 2011 12:22:44 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 6 Jun 2011 18:20:56 +0200 Message-Id: <1307377259-41434-8-git-send-email-andreas.faerber@web.de> In-Reply-To: <1307377259-41434-7-git-send-email-andreas.faerber@web.de> References: <1307377259-41434-1-git-send-email-andreas.faerber@web.de> <1307377259-41434-2-git-send-email-andreas.faerber@web.de> <1307377259-41434-3-git-send-email-andreas.faerber@web.de> <1307377259-41434-4-git-send-email-andreas.faerber@web.de> <1307377259-41434-5-git-send-email-andreas.faerber@web.de> <1307377259-41434-6-git-send-email-andreas.faerber@web.de> <1307377259-41434-7-git-send-email-andreas.faerber@web.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: andreas.faerber@web.de Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v2 07/10] fdc: Parametrize ISA base, IRQ and DMA List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= , hpoussin@reactos.org, kraxel@redhat.com, Markus Armbruster From: Herv=C3=A9 Poussineau Keep the PC values as defaults but allow to override them for PReP. Signed-off-by: Herv=C3=A9 Poussineau Cc: Markus Armbruster Signed-off-by: Andreas F=C3=A4rber --- 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 { =20 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 =3D DO_UPCAST(FDCtrlISABus, busdev, dev); FDCtrl *fdctrl =3D &isa->state; - int iobase =3D 0x3f0; - int isairq =3D 6; - int dma_chann =3D 2; int ret; =20 - 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); =20 - isa_init_irq(&isa->busdev, &fdctrl->irq, isairq); - fdctrl->dma_chann =3D dma_chann; + isa_init_irq(&isa->busdev, &fdctrl->irq, isa->irq); + fdctrl->dma_chann =3D isa->dma; =20 - qdev_set_legacy_instance_id(&dev->qdev, iobase, 2); + qdev_set_legacy_instance_id(&dev->qdev, isa->iobase, 2); ret =3D fdctrl_init_common(fdctrl); =20 add_boot_device_path(isa->bootindexA, &dev->qdev, "/floppy@0"); @@ -1979,6 +1979,9 @@ static ISADeviceInfo isa_fdc_info =3D { .qdev.vmsd =3D &vmstate_isa_fdc, .qdev.reset =3D fdctrl_external_reset_isa, .qdev.props =3D (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), --=20 1.7.5.3