[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 15/23] fdc: Parametrize ISA base, IRQ and DMA
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH v5 15/23] fdc: Parametrize ISA base, IRQ and DMA |
Date: |
Tue, 14 Jun 2011 04:37:49 +0200 |
From: Hervé Poussineau <address@hidden>
Keep the PC values as defaults but allow to override them for PReP.
Signed-off-by: Hervé Poussineau <address@hidden>
Cc: Markus Armbruster <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
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, "/address@hidden");
@@ -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),
--
1.7.5.3
- [Qemu-devel] [RFC 05/23] prep: Add i82374 DMA emulation, (continued)
- [Qemu-devel] [RFC 05/23] prep: Add i82374 DMA emulation, Andreas Färber, 2011/06/13
- [Qemu-devel] [RFC 06/23] prep: Add i82378 PCI-to-ISA bridge emulation, Andreas Färber, 2011/06/13
- [Qemu-devel] [RFC 07/23] 40p: Add a PCI to ISA bridge (i82378), Andreas Färber, 2011/06/13
- [Qemu-devel] [PATCH v5 08/23] qdev: Add support for property type bool, Andreas Färber, 2011/06/13
- [Qemu-devel] [PATCH v5 09/23] qdev: Add helpers for reading properties, Andreas Färber, 2011/06/13
- [Qemu-devel] [RFC v5 10/23] isa: Provide enable and disable callbacks, Andreas Färber, 2011/06/13
- [Qemu-devel] [RFC v5 11/23] isa: Allow to un-assign I/O ports, Andreas Färber, 2011/06/13
- [Qemu-devel] [RFC v5 12/23] isa: Allow to un-associate an IRQ, Andreas Färber, 2011/06/13
- [Qemu-devel] [RFC v5 13/23] parallel: Implement ISA state callbacks, Andreas Färber, 2011/06/13
- [Qemu-devel] [RFC v5 14/23] serial: Implement ISA state callbacks, Andreas Färber, 2011/06/13
- [Qemu-devel] [PATCH v5 15/23] fdc: Parametrize ISA base, IRQ and DMA,
Andreas Färber <=
- [Qemu-devel] [RFC v5 16/23] fdc: Implement ISA state callbacks, Andreas Färber, 2011/06/13
- [Qemu-devel] [RFC v5 17/23] ide: Allow to discard I/O ports, Andreas Färber, 2011/06/13
- [Qemu-devel] [RFC v5 18/23] ide: Implement ISA state callbacks, Andreas Färber, 2011/06/13
- [Qemu-devel] [RFC v5 19/23] prep: Add pc87312 Super I/O emulation, Andreas Färber, 2011/06/13
- [Qemu-devel] [RFC 20/23] 40p: Add the Super I/O chip (pc87312), Andreas Färber, 2011/06/13
- [Qemu-devel] [RFC 21/23] 40p: Add an audio card and a keyboard, Andreas Färber, 2011/06/13
- [Qemu-devel] [RFC 22/23] prep: qdev'ify System I/O (WIP), Andreas Färber, 2011/06/13
- [Qemu-devel] [RFC 23/23] 40p: Add an 8514/A graphics card, Andreas Färber, 2011/06/13
- Re: [Qemu-devel] [RFC 23/23] 40p: Add an 8514/A graphics card, Roy Tam, 2011/06/15
- Re: [Qemu-devel] [RFC 23/23] 40p: Add an 8514/A graphics card, Andreas Färber, 2011/06/15