[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2/5] fdc: Parametrize ISA base, IRQ and DMA
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH 2/5] fdc: Parametrize ISA base, IRQ and DMA |
Date: |
Mon, 30 Apr 2012 17:24:14 +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>
Signed-off-by: Andreas Färber <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
---
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 {
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 = DO_UPCAST(FDCtrlISABus, busdev, dev);
FDCtrl *fdctrl = &isa->state;
- int iobase = 0x3f0;
- int isairq = 6;
- int dma_chann = 2;
int ret;
- isa_register_portio_list(dev, iobase, fdc_portio_list, fdctrl, "fdc");
+ isa_register_portio_list(dev, isa->iobase, fdc_portio_list, fdctrl, "fdc");
- 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");
@@ -2046,6 +2046,9 @@ static const VMStateDescription vmstate_isa_fdc ={
};
static Property isa_fdc_properties[] = {
+ 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.7
- [Qemu-devel] [PULL v2] PReP patch queue 2012-04-30, Andreas Färber, 2012/04/30
- [Qemu-devel] [PATCH 3/5] isa: Add isa_bus_from_device() method, Andreas Färber, 2012/04/30
- [Qemu-devel] [PATCH 1/5] i82378/i82374: Do not create DMA controller twice, Andreas Färber, 2012/04/30
- [Qemu-devel] [PATCH 2/5] fdc: Parametrize ISA base, IRQ and DMA,
Andreas Färber <=
- [Qemu-devel] [PATCH 4/5] prep: Initialize PC speaker, Andreas Färber, 2012/04/30
- [Qemu-devel] [PATCH 5/5] prep: Move int-ack register from PReP to Raven PCI emulation, Andreas Färber, 2012/04/30