From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:49133) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QTxoT-0001iB-BS for qemu-devel@nongnu.org; Tue, 07 Jun 2011 11:03:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QTxo9-0000QB-D6 for qemu-devel@nongnu.org; Tue, 07 Jun 2011 11:03:24 -0400 Received: from fmmailgate03.web.de ([217.72.192.234]:35602) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QTxo8-0000PD-J3 for qemu-devel@nongnu.org; Tue, 07 Jun 2011 11:03:05 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Tue, 7 Jun 2011 17:02:55 +0200 Message-Id: <1307458978-51287-8-git-send-email-andreas.faerber@web.de> In-Reply-To: <1307458978-51287-7-git-send-email-andreas.faerber@web.de> References: <4DEDD0BA.1080407@redhat.com> <1307458978-51287-1-git-send-email-andreas.faerber@web.de> <1307458978-51287-2-git-send-email-andreas.faerber@web.de> <1307458978-51287-3-git-send-email-andreas.faerber@web.de> <1307458978-51287-4-git-send-email-andreas.faerber@web.de> <1307458978-51287-5-git-send-email-andreas.faerber@web.de> <1307458978-51287-6-git-send-email-andreas.faerber@web.de> <1307458978-51287-7-git-send-email-andreas.faerber@web.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: andreas.faerber@web.de Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [RFC v2 07/10] fdc: Implement ISA set_state() callback List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= , hpoussin@reactos.org, kraxel@redhat.com Signed-off-by: Andreas F=C3=A4rber --- 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); } =20 +static void isabus_fdc_set_state(ISADevice *dev, bool enabled) +{ + FDCtrlISABus *isa =3D DO_UPCAST(FDCtrlISABus, busdev, dev); + FDCtrl *fdctrl =3D &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); + =20 + isa_discard_irq(&isa->busdev, isa->irq); + } +} + static int isabus_fdc_init1(ISADevice *dev) { FDCtrlISABus *isa =3D DO_UPCAST(FDCtrlISABus, busdev, dev); FDCtrl *fdctrl =3D &isa->state; int ret; =20 - 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 =3D isa->dma; + isabus_fdc_set_state(dev, true); =20 qdev_set_legacy_instance_id(&dev->qdev, isa->iobase, 2); ret =3D fdctrl_init_common(fdctrl); @@ -1972,6 +1989,7 @@ static const VMStateDescription vmstate_isa_fdc =3D= { =20 static ISADeviceInfo isa_fdc_info =3D { .init =3D isabus_fdc_init1, + .set_state =3D isabus_fdc_set_state, .qdev.name =3D "isa-fdc", .qdev.fw_name =3D "fdc", .qdev.size =3D sizeof(FDCtrlISABus), --=20 1.7.5.3