From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Mq3wB-0006Um-Vi for qemu-devel@nongnu.org; Tue, 22 Sep 2009 07:53:40 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Mq3w6-0006SJ-7d for qemu-devel@nongnu.org; Tue, 22 Sep 2009 07:53:38 -0400 Received: from [199.232.76.173] (port=37787 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mq3w6-0006SF-2C for qemu-devel@nongnu.org; Tue, 22 Sep 2009 07:53:34 -0400 Received: from mx1.redhat.com ([209.132.183.28]:26058) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Mq3w5-00061R-FX for qemu-devel@nongnu.org; Tue, 22 Sep 2009 07:53:33 -0400 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8MBrTa9002909 for ; Tue, 22 Sep 2009 07:53:29 -0400 From: Gerd Hoffmann Date: Tue, 22 Sep 2009 13:53:22 +0200 Message-Id: <1253620402-18682-6-git-send-email-kraxel@redhat.com> In-Reply-To: <1253620402-18682-1-git-send-email-kraxel@redhat.com> References: <1253620402-18682-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 5/5] parallel: convert isa to qdev List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann Signed-off-by: Gerd Hoffmann --- hw/mips_malta.c | 2 +- hw/parallel.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++------- hw/pc.c | 3 +- hw/pc.h | 2 +- hw/sun4u.c | 3 +- 5 files changed, 57 insertions(+), 14 deletions(-) diff --git a/hw/mips_malta.c b/hw/mips_malta.c index 9e7daed..7b045ba 100644 --- a/hw/mips_malta.c +++ b/hw/mips_malta.c @@ -945,7 +945,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..2635edc 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,19 +445,23 @@ 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; + int base = isa->iobase; 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; } @@ -469,7 +480,22 @@ ParallelState *parallel_init(int base, qemu_irq irq, CharDriverState *chr) register_ioport_write(base, 8, 1, parallel_ioport_write_sw, s); register_ioport_read(base, 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 +573,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 04caef5..f54ac58 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -1335,8 +1335,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 8f317d3..37e3dda 100644 --- a/hw/sun4u.c +++ b/hw/sun4u.c @@ -605,8 +605,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]); } } -- 1.6.2.5