From patchwork Wed Sep 16 20:25:44 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 33742 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id F33C6B7B70 for ; Thu, 17 Sep 2009 06:49:19 +1000 (EST) Received: from localhost ([127.0.0.1]:39888 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mo1RD-0006gy-GC for incoming@patchwork.ozlabs.org; Wed, 16 Sep 2009 16:49:15 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Mo14h-0006qq-Ik for qemu-devel@nongnu.org; Wed, 16 Sep 2009 16:25:59 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Mo14c-0006ok-5s for qemu-devel@nongnu.org; Wed, 16 Sep 2009 16:25:58 -0400 Received: from [199.232.76.173] (port=60824 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mo14b-0006oc-Uu for qemu-devel@nongnu.org; Wed, 16 Sep 2009 16:25:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:13373) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Mo14b-0001Ug-A7 for qemu-devel@nongnu.org; Wed, 16 Sep 2009 16:25:53 -0400 Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8GKPqBo012038 for ; Wed, 16 Sep 2009 16:25:52 -0400 Received: from zweiblum.home.kraxel.org (vpn2-9-132.ams2.redhat.com [10.36.9.132]) by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id n8GKPoZn012878; Wed, 16 Sep 2009 16:25:51 -0400 Received: by zweiblum.home.kraxel.org (Postfix, from userid 500) id 40F03700E4; Wed, 16 Sep 2009 22:25:44 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Wed, 16 Sep 2009 22:25:44 +0200 Message-Id: <1253132744-10492-6-git-send-email-kraxel@redhat.com> In-Reply-To: <1253132744-10492-1-git-send-email-kraxel@redhat.com> References: <1253132744-10492-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.17 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH 5/5] parallel: convert isa to qdev X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Gerd Hoffmann --- hw/mips_malta.c | 2 +- hw/parallel.c | 80 ++++++++++++++++++++++++++++++++++++++++++------------ hw/pc.c | 3 +- hw/pc.h | 2 +- hw/sun4u.c | 3 +- 5 files changed, 66 insertions(+), 24 deletions(-) diff --git a/hw/mips_malta.c b/hw/mips_malta.c index ed11b45..e348c1e 100644 --- a/hw/mips_malta.c +++ b/hw/mips_malta.c @@ -936,7 +936,7 @@ void mips_malta_init (ram_addr_t ram_size, serial_isa_init(0, serial_hds[0]); serial_isa_init(1, serial_hds[1]); if (parallel_hds[0]) - parallel_init(0x378, isa_reserve_irq(7), parallel_hds[0]); + parallel_init(0, parallel_hds[0]); for(i = 0; i < MAX_FD; i++) { fd[i] = drive_get(IF_FLOPPY, 0, i); } diff --git a/hw/parallel.c b/hw/parallel.c index faaaa0d..30c53a2 100644 --- a/hw/parallel.c +++ b/hw/parallel.c @@ -78,6 +78,13 @@ struct ParallelState { int it_shift; }; +typedef struct ISAParallelState { + ISADevice dev; + uint32_t iobase; + uint32_t isairq; + ParallelState state; +} ISAParallelState; + static void parallel_update_irq(ParallelState *s) { if (s->irq_pending) @@ -438,38 +445,56 @@ static void parallel_reset(void *opaque) s->last_read_offset = ~0U; } -/* If fd is zero, it means that the parallel device uses the console */ -ParallelState *parallel_init(int base, qemu_irq irq, CharDriverState *chr) +static int parallel_isa_initfn(ISADevice *dev) { - ParallelState *s; + ISAParallelState *isa = DO_UPCAST(ISAParallelState, dev, dev); + ParallelState *s = &isa->state; uint8_t dummy; - s = qemu_mallocz(sizeof(ParallelState)); - s->irq = irq; - s->chr = chr; + if (!s->chr) { + fprintf(stderr, "Can't create parallel device, empty char device\n"); + exit(1); + } + + isa_init_irq(dev, &s->irq, isa->isairq); parallel_reset(s); qemu_register_reset(parallel_reset, s); - if (qemu_chr_ioctl(chr, CHR_IOCTL_PP_READ_STATUS, &dummy) == 0) { + if (qemu_chr_ioctl(s->chr, CHR_IOCTL_PP_READ_STATUS, &dummy) == 0) { s->hw_driver = 1; s->status = dummy; } 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); - register_ioport_write(base+4, 1, 2, parallel_ioport_eppdata_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_eppdata_write_hw4, s); - register_ioport_read(base+4, 1, 4, parallel_ioport_eppdata_read_hw4, s); - register_ioport_write(base+0x400, 8, 1, parallel_ioport_ecp_write, s); - register_ioport_read(base+0x400, 8, 1, parallel_ioport_ecp_read, s); + register_ioport_write(isa->iobase, 8, 1, parallel_ioport_write_hw, s); + register_ioport_read(isa->iobase, 8, 1, parallel_ioport_read_hw, s); + register_ioport_write(isa->iobase+4, 1, 2, parallel_ioport_eppdata_write_hw2, s); + register_ioport_read(isa->iobase+4, 1, 2, parallel_ioport_eppdata_read_hw2, s); + register_ioport_write(isa->iobase+4, 1, 4, parallel_ioport_eppdata_write_hw4, s); + register_ioport_read(isa->iobase+4, 1, 4, parallel_ioport_eppdata_read_hw4, s); + register_ioport_write(isa->iobase+0x400, 8, 1, parallel_ioport_ecp_write, s); + register_ioport_read(isa->iobase+0x400, 8, 1, parallel_ioport_ecp_read, s); } else { - register_ioport_write(base, 8, 1, parallel_ioport_write_sw, s); - register_ioport_read(base, 8, 1, parallel_ioport_read_sw, s); + register_ioport_write(isa->iobase, 8, 1, parallel_ioport_write_sw, s); + register_ioport_read(isa->iobase, 8, 1, parallel_ioport_read_sw, s); } - return s; + return 0; +} + +static const int isa_parallel_io[MAX_PARALLEL_PORTS] = { 0x378, 0x278, 0x3bc }; + +ParallelState *parallel_init(int index, CharDriverState *chr) +{ + ISADevice *dev; + + dev = isa_create("isa-parallel"); + qdev_prop_set_uint32(&dev->qdev, "iobase", isa_parallel_io[index]); + qdev_prop_set_uint32(&dev->qdev, "irq", 7); + qdev_prop_set_chr(&dev->qdev, "chardev", chr); + if (qdev_init(&dev->qdev) != 0) + return NULL; + return &DO_UPCAST(ISAParallelState, dev, dev)->state; } /* Memory mapped interface */ @@ -547,3 +572,22 @@ ParallelState *parallel_mm_init(target_phys_addr_t base, int it_shift, qemu_irq cpu_register_physical_memory(base, 8 << it_shift, io_sw); return s; } + +static ISADeviceInfo parallel_isa_info = { + .qdev.name = "isa-parallel", + .qdev.size = sizeof(ISAParallelState), + .init = parallel_isa_initfn, + .qdev.props = (Property[]) { + DEFINE_PROP_HEX32("iobase", ISAParallelState, iobase, 0x378), + DEFINE_PROP_UINT32("irq", ISAParallelState, isairq, 7), + DEFINE_PROP_CHR("chardev", ISAParallelState, state.chr), + DEFINE_PROP_END_OF_LIST(), + }, +}; + +static void parallel_register_devices(void) +{ + isa_qdev_register(¶llel_isa_info); +} + +device_init(parallel_register_devices) diff --git a/hw/pc.c b/hw/pc.c index 052c0a2..85e59cc 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -1332,8 +1332,7 @@ static void pc_init1(ram_addr_t ram_size, for(i = 0; i < MAX_PARALLEL_PORTS; i++) { if (parallel_hds[i]) { - parallel_init(parallel_io[i], isa_reserve_irq(parallel_irq[i]), - parallel_hds[i]); + parallel_init(i, parallel_hds[i]); } } diff --git a/hw/pc.h b/hw/pc.h index b547d17..5139616 100644 --- a/hw/pc.h +++ b/hw/pc.h @@ -17,7 +17,7 @@ SerialState *serial_isa_init(int index, CharDriverState *chr); /* parallel.c */ typedef struct ParallelState ParallelState; -ParallelState *parallel_init(int base, qemu_irq irq, CharDriverState *chr); +ParallelState *parallel_init(int index, CharDriverState *chr); ParallelState *parallel_mm_init(target_phys_addr_t base, int it_shift, qemu_irq irq, CharDriverState *chr); /* i8259.c */ diff --git a/hw/sun4u.c b/hw/sun4u.c index 2b55cf3..e93c007 100644 --- a/hw/sun4u.c +++ b/hw/sun4u.c @@ -593,8 +593,7 @@ static void sun4uv_init(ram_addr_t RAM_size, for(i = 0; i < MAX_PARALLEL_PORTS; i++) { if (parallel_hds[i]) { - parallel_init(parallel_io[i], NULL/*parallel_irq[i]*/, - parallel_hds[i]); + parallel_init(i, parallel_hds[i]); } }