From patchwork Mon Jun 6 16:20:56 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [v2,07/10] fdc: Parametrize ISA base, IRQ and DMA Date: Mon, 06 Jun 2011 06:20:56 -0000 From: =?utf-8?q?Andreas_F=C3=A4rber_=3Candreas=2Efaerber=40web=2Ede=3E?= X-Patchwork-Id: 98990 Message-Id: <1307377259-41434-8-git-send-email-andreas.faerber@web.de> To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= , hpoussin@reactos.org, kraxel@redhat.com, Markus Armbruster 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),