[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC v2 07/10] fdc: Implement ISA set_state() callback
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [RFC v2 07/10] fdc: Implement ISA set_state() callback |
Date: |
Tue, 7 Jun 2011 17:02:55 +0200 |
Signed-off-by: Andreas Färber <address@hidden>
---
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
- Re: [Qemu-devel] [RFC 05/10] serial: Allow to reconfigure ISA I/O base, (continued)
Re: [Qemu-devel] [RFC 00/10] ISA reconfigurability, Gerd Hoffmann, 2011/06/07
- [Qemu-devel] [RFC v2 00/10] ISA reconfigurability v2, Andreas Färber, 2011/06/07
- [Qemu-devel] [RFC v2 01/10] isa: Provide set_state callback, Andreas Färber, 2011/06/07
- [Qemu-devel] [RFC v2 02/10] isa: Allow to un-assign I/O ports, Andreas Färber, 2011/06/07
- [Qemu-devel] [RFC v2 03/10] isa: Allow to un-associate an IRQ, Andreas Färber, 2011/06/07
- [Qemu-devel] [RFC v2 04/10] parallel: Implement ISA set_state callback, Andreas Färber, 2011/06/07
- [Qemu-devel] [RFC v2 05/10] serial: Implement ISA set_state() callback, Andreas Färber, 2011/06/07
- [Qemu-devel] [PATCH v2 06/10] fdc: Parametrize ISA base, IRQ and DMA, Andreas Färber, 2011/06/07
- [Qemu-devel] [RFC v2 07/10] fdc: Implement ISA set_state() callback,
Andreas Färber <=
- [Qemu-devel] [RFC v2 08/10] ide: Allow to discard I/O ports, Andreas Färber, 2011/06/07
- [Qemu-devel] [RFC v2 09/10] ide: Implement ISA set_state() callback, Andreas Färber, 2011/06/07
- [Qemu-devel] [RFC v2 10/10] prep: Add pc87312 Super I/O emulation, Andreas Färber, 2011/06/07
Re: [Qemu-devel] [RFC v2 00/10] ISA reconfigurability v2, Gerd Hoffmann, 2011/06/07
Re: [Qemu-devel] [RFC v2 00/10] ISA reconfigurability v2, Andreas Färber, 2011/06/07
Re: [Qemu-devel] [RFC v2 00/10] ISA reconfigurability v2, Gerd Hoffmann, 2011/06/08
[Qemu-devel] [RFC v4 00/12] ISA reconfigurability v4, Andreas Färber, 2011/06/08
[Qemu-devel] [PATCH v4 01/12] qdev: Add support for property type bool, Andreas Färber, 2011/06/08
[Qemu-devel] [PATCH v4 02/12] qdev: Add helpers for reading properties, Andreas Färber, 2011/06/08
[Qemu-devel] [RFC v4 03/12] isa: Provide set_state callback, Andreas Färber, 2011/06/08