From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:49122) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QTxoS-0001hx-Nl for qemu-devel@nongnu.org; Tue, 07 Jun 2011 11:03:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QTxo7-0000Oy-JG for qemu-devel@nongnu.org; Tue, 07 Jun 2011 11:03:22 -0400 Received: from fmmailgate03.web.de ([217.72.192.234]:35550) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QTxo7-0000Na-0J for qemu-devel@nongnu.org; Tue, 07 Jun 2011 11:03:03 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Tue, 7 Jun 2011 17:02:52 +0200 Message-Id: <1307458978-51287-5-git-send-email-andreas.faerber@web.de> In-Reply-To: <1307458978-51287-4-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> 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 04/10] parallel: 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/parallel.c | 67 ++++++++++++++++++++++++++++++++++++++-------------= ----- 1 files changed, 45 insertions(+), 22 deletions(-) diff --git a/hw/parallel.c b/hw/parallel.c index cc853a5..db5bb57 100644 --- a/hw/parallel.c +++ b/hw/parallel.c @@ -446,6 +446,49 @@ static void parallel_reset(void *opaque) s->last_read_offset =3D ~0U; } =20 +static void parallel_isa_statefn(ISADevice *dev, bool enabled) +{ + ISAParallelState *isa =3D DO_UPCAST(ISAParallelState, dev, dev); + ParallelState *s =3D &isa->state; + int base; + + base =3D isa->iobase; + if (enabled) { + isa_init_irq(dev, &s->irq, isa->isairq); + + if (s->hw_driver) { + register_ioport_write(base, 8, 1, parallel_ioport_write_hw, = s); + register_ioport_read(base, 8, 1, parallel_ioport_read_hw, s)= ; + isa_init_ioport_range(dev, base, 8); + + register_ioport_write(base + 4, 1, 2, parallel_ioport_eppdat= a_write_hw2, s); + register_ioport_read(base + 4, 1, 2, parallel_ioport_eppdata= _read_hw2, s); + register_ioport_write(base + 4, 1, 4, parallel_ioport_eppdat= a_write_hw4, s); + register_ioport_read(base + 4, 1, 4, parallel_ioport_eppdata= _read_hw4, s); + isa_init_ioport(dev, base + 4); + register_ioport_write(base + 0x400, 8, 1, parallel_ioport_ec= p_write, s); + register_ioport_read(base + 0x400, 8, 1, parallel_ioport_ecp= _read, s); + isa_init_ioport_range(dev, base + 0x400, 8); + } + else { + register_ioport_write(base, 8, 1, parallel_ioport_write_sw, = s); + register_ioport_read(base, 8, 1, parallel_ioport_read_sw, s)= ; + isa_init_ioport_range(dev, base, 8); + } + } else { + isa_discard_irq(dev, isa->isairq); + + isa_discard_ioport_range(dev, base, 8); + isa_unassign_ioport(base, 8); + if (s->hw_driver) { + isa_discard_ioport_range(dev, base + 4, 1); + isa_unassign_ioport(base + 4, 1); + isa_discard_ioport_range(dev, base + 0x400, 8); + isa_unassign_ioport(base + 0x400, 8); + } + } +} + static const int isa_parallel_io[MAX_PARALLEL_PORTS] =3D { 0x378, 0x278,= 0x3bc }; =20 static int parallel_isa_initfn(ISADevice *dev) @@ -453,7 +496,6 @@ static int parallel_isa_initfn(ISADevice *dev) static int index; ISAParallelState *isa =3D DO_UPCAST(ISAParallelState, dev, dev); ParallelState *s =3D &isa->state; - int base; uint8_t dummy; =20 if (!s->chr) { @@ -469,8 +511,6 @@ static int parallel_isa_initfn(ISADevice *dev) isa->iobase =3D isa_parallel_io[isa->index]; index++; =20 - base =3D isa->iobase; - isa_init_irq(dev, &s->irq, isa->isairq); qemu_register_reset(parallel_reset, s); =20 if (qemu_chr_ioctl(s->chr, CHR_IOCTL_PP_READ_STATUS, &dummy) =3D=3D = 0) { @@ -478,25 +518,7 @@ static int parallel_isa_initfn(ISADevice *dev) s->status =3D dummy; } =20 - if (s->hw_driver) { - register_ioport_write(base, 8, 1, parallel_ioport_write_hw, s); - register_ioport_read(base, 8, 1, parallel_ioport_read_hw, s); - isa_init_ioport_range(dev, base, 8); - - register_ioport_write(base+4, 1, 2, parallel_ioport_eppdata_writ= e_hw2, s); - register_ioport_read(base+4, 1, 2, parallel_ioport_eppdata_read_= hw2, s); - register_ioport_write(base+4, 1, 4, parallel_ioport_eppdata_writ= e_hw4, s); - register_ioport_read(base+4, 1, 4, parallel_ioport_eppdata_read_= hw4, s); - isa_init_ioport(dev, base+4); - register_ioport_write(base+0x400, 8, 1, parallel_ioport_ecp_writ= e, s); - register_ioport_read(base+0x400, 8, 1, parallel_ioport_ecp_read,= s); - isa_init_ioport_range(dev, base+0x400, 8); - } - else { - register_ioport_write(base, 8, 1, parallel_ioport_write_sw, s); - register_ioport_read(base, 8, 1, parallel_ioport_read_sw, s); - isa_init_ioport_range(dev, base, 8); - } + parallel_isa_statefn(dev, true); return 0; } =20 @@ -581,6 +603,7 @@ static ISADeviceInfo parallel_isa_info =3D { .qdev.name =3D "isa-parallel", .qdev.size =3D sizeof(ISAParallelState), .init =3D parallel_isa_initfn, + .set_state =3D parallel_isa_statefn, .qdev.props =3D (Property[]) { DEFINE_PROP_UINT32("index", ISAParallelState, index, -1), DEFINE_PROP_HEX32("iobase", ISAParallelState, iobase, -1), --=20 1.7.5.3