From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:58559) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QTcZj-0002bI-EP for qemu-devel@nongnu.org; Mon, 06 Jun 2011 12:22:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QTcZg-00036x-8z for qemu-devel@nongnu.org; Mon, 06 Jun 2011 12:22:46 -0400 Received: from fmmailgate03.web.de ([217.72.192.234]:41133) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QTcZf-00036Y-3n for qemu-devel@nongnu.org; Mon, 06 Jun 2011 12:22:43 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 6 Jun 2011 18:20:57 +0200 Message-Id: <1307377259-41434-9-git-send-email-andreas.faerber@web.de> In-Reply-To: <1307377259-41434-8-git-send-email-andreas.faerber@web.de> References: <1307377259-41434-1-git-send-email-andreas.faerber@web.de> <1307377259-41434-2-git-send-email-andreas.faerber@web.de> <1307377259-41434-3-git-send-email-andreas.faerber@web.de> <1307377259-41434-4-git-send-email-andreas.faerber@web.de> <1307377259-41434-5-git-send-email-andreas.faerber@web.de> <1307377259-41434-6-git-send-email-andreas.faerber@web.de> <1307377259-41434-7-git-send-email-andreas.faerber@web.de> <1307377259-41434-8-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 08/10] fdc: Allow to reconfigure ISA I/O base 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 | 29 ++++++++++++++++++++++++++--- hw/fdc.h | 3 +++ 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/hw/fdc.c b/hw/fdc.c index f4e3e0d..abdd806 100644 --- a/hw/fdc.c +++ b/hw/fdc.c @@ -1894,11 +1894,10 @@ static int fdctrl_init_common(FDCtrl *fdctrl) return fdctrl_connect_drives(fdctrl); } =20 -static int isabus_fdc_init1(ISADevice *dev) +static void isabus_fdc_init_iobase(FDCtrlISABus *isa) { - FDCtrlISABus *isa =3D DO_UPCAST(FDCtrlISABus, busdev, dev); + ISADevice *dev =3D &isa->busdev; FDCtrl *fdctrl =3D &isa->state; - int ret; =20 register_ioport_read(isa->iobase + 0x01, 5, 1, &fdctrl_read_port, fdctrl); @@ -1910,6 +1909,30 @@ static int isabus_fdc_init1(ISADevice *dev) &fdctrl_write_port, fdctrl); isa_init_ioport_range(dev, isa->iobase, 6); isa_init_ioport(dev, isa->iobase + 7); +} + +void fdctrl_isa_reconfigure_iobase(ISADevice *dev, uint32_t base) +{ + FDCtrlISABus *isa =3D DO_UPCAST(FDCtrlISABus, busdev, dev); + + if (base !=3D isa->iobase) { + 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->iobase =3D base; + isabus_fdc_init_iobase(isa); + } +} + +static int isabus_fdc_init1(ISADevice *dev) +{ + FDCtrlISABus *isa =3D DO_UPCAST(FDCtrlISABus, busdev, dev); + FDCtrl *fdctrl =3D &isa->state; + int ret; + + isabus_fdc_init_iobase(isa); =20 isa_init_irq(&isa->busdev, &fdctrl->irq, isa->irq); fdctrl->dma_chann =3D isa->dma; diff --git a/hw/fdc.h b/hw/fdc.h index 09f73c6..3e410e9 100644 --- a/hw/fdc.h +++ b/hw/fdc.h @@ -28,4 +28,7 @@ void fdctrl_init_sysbus(qemu_irq irq, int dma_chann, target_phys_addr_t mmio_base, DriveInfo **fds); void sun4m_fdctrl_init(qemu_irq irq, target_phys_addr_t io_base, DriveInfo **fds, qemu_irq *fdc_tc); + +void fdctrl_isa_reconfigure_iobase(ISADevice *dev, uint32_t base); + #endif --=20 1.7.5.3