From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:58642) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QTcZn-0002cN-JT for qemu-devel@nongnu.org; Mon, 06 Jun 2011 12:22:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QTcZj-00038U-Em for qemu-devel@nongnu.org; Mon, 06 Jun 2011 12:22:50 -0400 Received: from fmmailgate01.web.de ([217.72.192.221]:42906) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QTcZi-000380-Pa for qemu-devel@nongnu.org; Mon, 06 Jun 2011 12:22:47 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 6 Jun 2011 18:20:54 +0200 Message-Id: <1307377259-41434-6-git-send-email-andreas.faerber@web.de> In-Reply-To: <1307377259-41434-5-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> 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 05/10] serial: 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/isa.h | 3 +++ hw/serial.c | 23 ++++++++++++++++++++--- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/hw/isa.h b/hw/isa.h index 54698b5..8bd082a 100644 --- a/hw/isa.h +++ b/hw/isa.h @@ -45,6 +45,9 @@ void isa_mmio_init(target_phys_addr_t base, target_phys= _addr_t size); void parallel_isa_reconfigure_iobase(ISADevice *dev, uint32_t base); void parallel_isa_reconfigure_irq(ISADevice *dev, uint32_t isairq); =20 +/* serial.c */ +void serial_isa_reconfigure_iobase(ISADevice *dev, uint32_t base); + /* dma.c */ int DMA_get_channel_mode (int nchan); int DMA_read_memory (int nchan, void *buf, int pos, int size); diff --git a/hw/serial.c b/hw/serial.c index 0ee61dd..dd91272 100644 --- a/hw/serial.c +++ b/hw/serial.c @@ -752,6 +752,25 @@ void serial_set_frequency(SerialState *s, uint32_t f= requency) serial_update_parameters(s); } =20 +static void serial_isa_init_iobase(ISASerialState *isa) +{ + SerialState *s =3D &isa->state; + + register_ioport_write(isa->iobase, 8, 1, serial_ioport_write, s); + register_ioport_read(isa->iobase, 8, 1, serial_ioport_read, s); + isa_init_ioport_range(&isa->dev, isa->iobase, 8); +} + +void serial_isa_reconfigure_iobase(ISADevice *dev, uint32_t iobase) +{ + ISASerialState *isa =3D DO_UPCAST(ISASerialState, dev, dev); + + if (iobase !=3D isa->iobase) { + isa->iobase =3D iobase; + serial_isa_init_iobase(isa); + } +} + static const int isa_serial_io[MAX_SERIAL_PORTS] =3D { 0x3f8, 0x2f8, 0x3= e8, 0x2e8 }; static const int isa_serial_irq[MAX_SERIAL_PORTS] =3D { 4, 3, 4, 3 }; =20 @@ -776,9 +795,7 @@ static int serial_isa_initfn(ISADevice *dev) serial_init_core(s); qdev_set_legacy_instance_id(&dev->qdev, isa->iobase, 3); =20 - register_ioport_write(isa->iobase, 8, 1, serial_ioport_write, s); - register_ioport_read(isa->iobase, 8, 1, serial_ioport_read, s); - isa_init_ioport_range(dev, isa->iobase, 8); + serial_isa_init_iobase(isa); return 0; } =20 --=20 1.7.5.3