From patchwork Sun Dec 26 02:33:02 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 76711 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 CAA8AB70E7 for ; Sun, 26 Dec 2010 13:34:19 +1100 (EST) Received: from localhost ([127.0.0.1]:46958 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PWgR5-0007qM-VB for incoming@patchwork.ozlabs.org; Sat, 25 Dec 2010 21:34:16 -0500 Received: from [140.186.70.92] (port=33731 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PWgQ0-0007Vx-OL for qemu-devel@nongnu.org; Sat, 25 Dec 2010 21:33:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PWgPz-00070e-Fr for qemu-devel@nongnu.org; Sat, 25 Dec 2010 21:33:08 -0500 Received: from fmmailgate02.web.de ([217.72.192.227]:53578) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PWgPz-00070N-3K for qemu-devel@nongnu.org; Sat, 25 Dec 2010 21:33:07 -0500 Received: from smtp06.web.de ( [172.20.5.172]) by fmmailgate02.web.de (Postfix) with ESMTP id 2B6DA1914D29A; Sun, 26 Dec 2010 03:33:04 +0100 (CET) Received: from [87.173.123.99] (helo=af.local) by smtp06.web.de with asmtp (WEB.DE 4.110 #2) id 1PWgPv-0002FS-00; Sun, 26 Dec 2010 03:33:03 +0100 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Sun, 26 Dec 2010 03:33:02 +0100 Message-Id: <1293330782-34630-1-git-send-email-andreas.faerber@web.de> X-Mailer: git-send-email 1.7.3.4 MIME-Version: 1.0 X-Sender: Andreas.Faerber@web.de X-Provags-ID: V01U2FsdGVkX18R39JO07/U8t06ib50YJob9DWOpMMjW/Hxp+3p u65BV1hcg4JSgWXqTeEOJgfb8weZa5Q2NUDco7fZnooP+1UDPk rIkKTWhfI0RO9qjnfw0w== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= , =?UTF-8?q?Herv=C3=A9=20Poussineau?= Subject: [Qemu-devel] [PATCH] floppy: Parametrize ISA base and IRQ 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 From: Hervé Poussineau v1: * Rebased. Signed-off-by: Hervé Poussineau Signed-off-by: Andreas Färber --- This patch allows to adapt the floppy device for the PReP Super I/O. hw/fdc.c | 27 +++++++++++++++------------ 1 files changed, 15 insertions(+), 12 deletions(-) diff --git a/hw/fdc.c b/hw/fdc.c index 4bbcc47..2d834f5 100644 --- a/hw/fdc.c +++ b/hw/fdc.c @@ -523,6 +523,9 @@ typedef struct FDCtrlSysBus { typedef struct FDCtrlISABus { ISADevice busdev; + uint32_t iobase; + uint32_t irq; + uint32_t dma; struct FDCtrl state; int32_t bootindexA; int32_t bootindexB; @@ -1973,26 +1976,23 @@ static int isabus_fdc_init1(ISADevice *dev) { FDCtrlISABus *isa = DO_UPCAST(FDCtrlISABus, busdev, dev); FDCtrl *fdctrl = &isa->state; - int iobase = 0x3f0; - int isairq = 6; - int dma_chann = 2; int ret; - register_ioport_read(iobase + 0x01, 5, 1, + register_ioport_read(isa->iobase + 0x01, 5, 1, &fdctrl_read_port, fdctrl); - register_ioport_read(iobase + 0x07, 1, 1, + register_ioport_read(isa->iobase + 0x07, 1, 1, &fdctrl_read_port, fdctrl); - register_ioport_write(iobase + 0x01, 5, 1, + register_ioport_write(isa->iobase + 0x01, 5, 1, &fdctrl_write_port, fdctrl); - register_ioport_write(iobase + 0x07, 1, 1, + register_ioport_write(isa->iobase + 0x07, 1, 1, &fdctrl_write_port, fdctrl); - isa_init_ioport_range(dev, iobase, 6); - isa_init_ioport(dev, iobase + 7); + isa_init_ioport_range(dev, isa->iobase, 6); + isa_init_ioport(dev, isa->iobase + 7); - isa_init_irq(&isa->busdev, &fdctrl->irq, isairq); - fdctrl->dma_chann = dma_chann; + isa_init_irq(&isa->busdev, &fdctrl->irq, isa->irq); + fdctrl->dma_chann = isa->dma; - qdev_set_legacy_instance_id(&dev->qdev, iobase, 2); + qdev_set_legacy_instance_id(&dev->qdev, isa->iobase, 2); ret = fdctrl_init_common(fdctrl); add_boot_device_path(isa->bootindexA, &dev->qdev, "/floppy@0"); @@ -2057,6 +2057,9 @@ static ISADeviceInfo isa_fdc_info = { .qdev.vmsd = &vmstate_isa_fdc, .qdev.reset = fdctrl_external_reset_isa, .qdev.props = (Property[]) { + DEFINE_PROP_HEX32("iobase", FDCtrlISABus, iobase, 0x3f0), + DEFINE_PROP_UINT32("irq", FDCtrlISABus, irq, 6), + DEFINE_PROP_UINT32("dma", FDCtrlISABus, dma, 2), DEFINE_PROP_DRIVE("driveA", FDCtrlISABus, state.drives[0].bs), DEFINE_PROP_DRIVE("driveB", FDCtrlISABus, state.drives[1].bs), DEFINE_PROP_INT32("bootindexA", FDCtrlISABus, bootindexA, -1),