From patchwork Wed Sep 16 20:25:41 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 33737 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 EB518B7B69 for ; Thu, 17 Sep 2009 06:43:43 +1000 (EST) Received: from localhost ([127.0.0.1]:47139 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mo1Ln-0004RB-6I for incoming@patchwork.ozlabs.org; Wed, 16 Sep 2009 16:43:39 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Mo14e-0006pb-4Q for qemu-devel@nongnu.org; Wed, 16 Sep 2009 16:25:56 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Mo14a-0006nF-1k for qemu-devel@nongnu.org; Wed, 16 Sep 2009 16:25:55 -0400 Received: from [199.232.76.173] (port=60820 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mo14Z-0006n4-Kb for qemu-devel@nongnu.org; Wed, 16 Sep 2009 16:25:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:13358) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Mo14Y-0001U8-TG for qemu-devel@nongnu.org; Wed, 16 Sep 2009 16:25:51 -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 n8GKPoZt026381 for ; Wed, 16 Sep 2009 16:25:50 -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 n8GKPiK5012865; Wed, 16 Sep 2009 16:25:45 -0400 Received: by zweiblum.home.kraxel.org (Postfix, from userid 500) id 3161E700E1; Wed, 16 Sep 2009 22:25:44 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Wed, 16 Sep 2009 22:25:41 +0200 Message-Id: <1253132744-10492-3-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 2/5] floppy: move dma setup + drive connect to fdctrl_init_common() 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/fdc.c | 33 ++++++++++++--------------------- 1 files changed, 12 insertions(+), 21 deletions(-) diff --git a/hw/fdc.c b/hw/fdc.c index ea3b8ac..537db66 100644 --- a/hw/fdc.c +++ b/hw/fdc.c @@ -1842,23 +1842,14 @@ static void fdctrl_connect_drives(fdctrl_t *fdctrl) fdctrl_t *fdctrl_init_isa(DriveInfo **fds) { - fdctrl_t *fdctrl; ISADevice *dev; - int dma_chann = 2; dev = isa_create("isa-fdc"); qdev_prop_set_drive(&dev->qdev, "driveA", fds[0]); qdev_prop_set_drive(&dev->qdev, "driveB", fds[1]); if (qdev_init(&dev->qdev) != 0) return NULL; - fdctrl = &(DO_UPCAST(fdctrl_isabus_t, busdev, dev)->state); - - fdctrl->dma_chann = dma_chann; - DMA_register_channel(dma_chann, &fdctrl_transfer_handler, fdctrl); - - fdctrl_connect_drives(fdctrl); - - return fdctrl; + return &(DO_UPCAST(fdctrl_isabus_t, busdev, dev)->state); } fdctrl_t *fdctrl_init_sysbus(qemu_irq irq, int dma_chann, @@ -1870,19 +1861,16 @@ fdctrl_t *fdctrl_init_sysbus(qemu_irq irq, int dma_chann, fdctrl_sysbus_t *sys; dev = qdev_create(NULL, "sysbus-fdc"); + sys = DO_UPCAST(fdctrl_sysbus_t, busdev.qdev, dev); + fdctrl = &sys->state; + fdctrl->dma_chann = dma_chann; /* FIXME */ qdev_prop_set_drive(dev, "driveA", fds[0]); qdev_prop_set_drive(dev, "driveB", fds[1]); if (qdev_init(dev) != 0) return NULL; - sys = DO_UPCAST(fdctrl_sysbus_t, busdev.qdev, dev); - fdctrl = &sys->state; sysbus_connect_irq(&sys->busdev, 0, irq); sysbus_mmio_map(&sys->busdev, 0, mmio_base); - fdctrl->dma_chann = dma_chann; - DMA_register_channel(dma_chann, &fdctrl_transfer_handler, fdctrl); - fdctrl_connect_drives(fdctrl); - return fdctrl; } @@ -1901,11 +1889,7 @@ fdctrl_t *sun4m_fdctrl_init (qemu_irq irq, target_phys_addr_t io_base, fdctrl = &sys->state; sysbus_connect_irq(&sys->busdev, 0, irq); sysbus_mmio_map(&sys->busdev, 0, io_base); - *fdc_tc = qdev_get_gpio_in(dev, 0); - - fdctrl->dma_chann = -1; - - fdctrl_connect_drives(fdctrl); + *fdc_tc = qdev_get_gpio_in(dev, 0); /* FIXME */ return fdctrl; } @@ -1937,6 +1921,10 @@ static int fdctrl_init_common(fdctrl_t *fdctrl) fdctrl->config = FD_CONFIG_EIS | FD_CONFIG_EFIFO; /* Implicit seek, polling & FIFO enabled */ fdctrl->num_floppies = MAX_FD; + if (fdctrl->dma_chann != -1) + DMA_register_channel(fdctrl->dma_chann, &fdctrl_transfer_handler, fdctrl); + fdctrl_connect_drives(fdctrl); + fdctrl_external_reset(fdctrl); vmstate_register(-1, &vmstate_fdc, fdctrl); qemu_register_reset(fdctrl_external_reset, fdctrl); @@ -1949,6 +1937,7 @@ static int isabus_fdc_init1(ISADevice *dev) fdctrl_t *fdctrl = &isa->state; int iobase = 0x3f0; int isairq = 6; + int dma_chann = 2; register_ioport_read(iobase + 0x01, 5, 1, &fdctrl_read_port, fdctrl); @@ -1959,6 +1948,7 @@ static int isabus_fdc_init1(ISADevice *dev) register_ioport_write(iobase + 0x07, 1, 1, &fdctrl_write_port, fdctrl); isa_init_irq(&isa->busdev, &fdctrl->irq, isairq); + fdctrl->dma_chann = dma_chann; return fdctrl_init_common(fdctrl); } @@ -1972,6 +1962,7 @@ static int sysbus_fdc_init1(SysBusDevice *dev) sysbus_init_mmio(dev, 0x08, io); sysbus_init_irq(dev, &fdctrl->irq); qdev_init_gpio_in(&dev->qdev, fdctrl_handle_tc, 1); + fdctrl->dma_chann = -1; return fdctrl_init_common(fdctrl); }