Signed-off-by: Andreas Färber <andreas.faer...@web.de>
---
hw/fdc.c | 42 ++++++++++++++++++++++++++++++------------
1 files changed, 30 insertions(+), 12 deletions(-)
diff --git a/hw/fdc.c b/hw/fdc.c
index f4e3e0d..6d8914f 100644
--- a/hw/fdc.c
+++ b/hw/fdc.c
@@ -1894,25 +1894,42 @@ static int fdctrl_init_common(FDCtrl *fdctrl)
return fdctrl_connect_drives(fdctrl);
}
+static void isabus_fdc_set_state(ISADevice *dev, bool enabled)
+{
+ FDCtrlISABus *isa = DO_UPCAST(FDCtrlISABus, busdev, dev);
+ FDCtrl *fdctrl = &isa->state;
+
+ if (enabled) {
+ register_ioport_read(isa->iobase + 0x01, 5, 1,
+ &fdctrl_read_port, fdctrl);
+ register_ioport_read(isa->iobase + 0x07, 1, 1,
+ &fdctrl_read_port, fdctrl);
+ register_ioport_write(isa->iobase + 0x01, 5, 1,
+ &fdctrl_write_port, fdctrl);
+ register_ioport_write(isa->iobase + 0x07, 1, 1,
+ &fdctrl_write_port, fdctrl);
+ isa_init_ioport_range(dev, isa->iobase, 6);
+ isa_init_ioport(dev, isa->iobase + 7);
+
+ isa_init_irq(&isa->busdev, &fdctrl->irq, isa->irq);
+ } else {
+ isa_discard_ioport_range(dev, isa->iobase + 0x07, 1);
+ isa_discard_ioport_range(dev, isa->iobase + 0x01, 5);
+ isa_unassign_ioport(isa->iobase + 7, 1);
+ isa_unassign_ioport(isa->iobase, 6);
+
+ isa_discard_irq(&isa->busdev, isa->irq);
+ }
+}
+
static int isabus_fdc_init1(ISADevice *dev)
{
FDCtrlISABus *isa = DO_UPCAST(FDCtrlISABus, busdev, dev);
FDCtrl *fdctrl = &isa->state;
int ret;
- register_ioport_read(isa->iobase + 0x01, 5, 1,
- &fdctrl_read_port, fdctrl);
- register_ioport_read(isa->iobase + 0x07, 1, 1,
- &fdctrl_read_port, fdctrl);
- register_ioport_write(isa->iobase + 0x01, 5, 1,
- &fdctrl_write_port, fdctrl);
- register_ioport_write(isa->iobase + 0x07, 1, 1,
- &fdctrl_write_port, fdctrl);
- isa_init_ioport_range(dev, isa->iobase, 6);
- isa_init_ioport(dev, isa->iobase + 7);
-
- isa_init_irq(&isa->busdev, &fdctrl->irq, isa->irq);
fdctrl->dma_chann = isa->dma;
+ isabus_fdc_set_state(dev, true);
qdev_set_legacy_instance_id(&dev->qdev, isa->iobase, 2);
ret = fdctrl_init_common(fdctrl);
@@ -1972,6 +1989,7 @@ static const VMStateDescription vmstate_isa_fdc ={
static ISADeviceInfo isa_fdc_info = {
.init = isabus_fdc_init1,
+ .set_state = isabus_fdc_set_state,
.qdev.name = "isa-fdc",
.qdev.fw_name = "fdc",
.qdev.size = sizeof(FDCtrlISABus),
--
1.7.5.3
