From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:49131) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QTxoT-0001iA-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 1QTxo8-0000PY-EA for qemu-devel@nongnu.org; Tue, 07 Jun 2011 11:03:22 -0400 Received: from fmmailgate02.web.de ([217.72.192.227]:46699) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QTxo7-0000Nq-PM for qemu-devel@nongnu.org; Tue, 07 Jun 2011 11:03:04 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Tue, 7 Jun 2011 17:02:53 +0200 Message-Id: <1307458978-51287-6-git-send-email-andreas.faerber@web.de> In-Reply-To: <1307458978-51287-5-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> 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 05/10] serial: 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/serial.c | 25 +++++++++++++++++++++---- 1 files changed, 21 insertions(+), 4 deletions(-) diff --git a/hw/serial.c b/hw/serial.c index 0ee61dd..ec1e0a0 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_statefn(ISADevice *dev, bool enabled) +{ + ISASerialState *isa =3D DO_UPCAST(ISASerialState, dev, dev); + SerialState *s =3D &isa->state; + + if (enabled) { + isa_init_irq(dev, &s->irq, isa->isairq); + + 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); + } else { + isa_discard_irq(dev, isa->isairq); + + isa_discard_ioport_range(dev, isa->iobase, 8); + isa_unassign_ioport(isa->iobase, 8); + } +} + 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 @@ -772,13 +791,10 @@ static int serial_isa_initfn(ISADevice *dev) index++; =20 s->baudbase =3D 115200; - isa_init_irq(dev, &s->irq, isa->isairq); 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_statefn(dev, true); return 0; } =20 @@ -962,6 +978,7 @@ static ISADeviceInfo serial_isa_info =3D { .qdev.size =3D sizeof(ISASerialState), .qdev.vmsd =3D &vmstate_isa_serial, .init =3D serial_isa_initfn, + .set_state =3D serial_isa_statefn, .qdev.props =3D (Property[]) { DEFINE_PROP_UINT32("index", ISASerialState, index, -1), DEFINE_PROP_HEX32("iobase", ISASerialState, iobase, -1), --=20 1.7.5.3