From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:41926) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S8unm-0001lR-NB for qemu-devel@nongnu.org; Sat, 17 Mar 2012 10:40:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S8unk-00040E-Lg for qemu-devel@nongnu.org; Sat, 17 Mar 2012 10:40:14 -0400 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Sat, 17 Mar 2012 15:39:44 +0100 Message-Id: <1331995186-18507-5-git-send-email-hpoussin@reactos.org> In-Reply-To: <1331995186-18507-1-git-send-email-hpoussin@reactos.org> References: <1331995186-18507-1-git-send-email-hpoussin@reactos.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 4/6] 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: qemu-ppc@nongnu.org, =?UTF-8?q?Andreas=20F=C3=A4rber?= , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Markus Armbruster 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 | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/hw/fdc.c b/hw/fdc.c index a0236b7..756d4ce 100644 --- a/hw/fdc.c +++ b/hw/fdc.c @@ -438,6 +438,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; @@ -1971,17 +1974,14 @@ 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 - isa_register_portio_list(dev, iobase, fdc_portio_list, fdctrl, "fdc"= ); + isa_register_portio_list(dev, isa->iobase, fdc_portio_list, fdctrl, = "fdc"); =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"); @@ -2046,6 +2046,9 @@ static const VMStateDescription vmstate_isa_fdc =3D= { }; =20 static Property isa_fdc_properties[] =3D { + 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.9.1