From patchwork Mon Apr 30 15:24:14 2012 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: 155907 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 5D7FAB6FA1 for ; Tue, 1 May 2012 01:24:54 +1000 (EST) Received: from localhost ([::1]:36267 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SOsT6-0001Eo-5u for incoming@patchwork.ozlabs.org; Mon, 30 Apr 2012 11:24:52 -0400 Received: from eggs.gnu.org ([208.118.235.92]:35112) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SOsSp-0000x5-Df for qemu-devel@nongnu.org; Mon, 30 Apr 2012 11:24:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SOsSj-0003Ut-5c for qemu-devel@nongnu.org; Mon, 30 Apr 2012 11:24:34 -0400 Received: from mout.web.de ([212.227.15.4]:51530) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SOsSi-0003Um-SY for qemu-devel@nongnu.org; Mon, 30 Apr 2012 11:24:29 -0400 Received: from localhost.localdomain ([195.135.221.2]) by smtp.web.de (mrweb001) with ESMTPA (Nemesis) id 0MPY5x-1SKlrW2BKT-004fx0; Mon, 30 Apr 2012 17:24:19 +0200 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Mon, 30 Apr 2012 17:24:14 +0200 Message-Id: <1335799457-17125-3-git-send-email-andreas.faerber@web.de> X-Mailer: git-send-email 1.7.7 In-Reply-To: <1335799457-17125-1-git-send-email-andreas.faerber@web.de> References: <1335799457-17125-1-git-send-email-andreas.faerber@web.de> MIME-Version: 1.0 X-Provags-ID: V02:K0:mOL2c1QVZEtTeJv+kPRd4mMgzm346IwlOaV2DDRNJDi 4KyLvoMlgowisJve4/mZhS4posJWo01G5imxNUn6fWxbkS2lwq OqOKhezmc3V/olf8fkSOqZ1XGPBe+v7bbemsl3bL+dB+HazP/X 0XtYFmNKFAPg88pMsnTEqvYEbL5ZczEddy+OZz2PMmlDWr4orf qsJc5lk0Dj324s1ViSSAQ== X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 212.227.15.4 Cc: blauwirbel@gmail.com, =?UTF-8?q?Andreas=20F=C3=A4rber?= , =?UTF-8?q?Herv=C3=A9=20Poussineau?= Subject: [Qemu-devel] [PATCH 2/5] fdc: Parametrize ISA base, IRQ and DMA X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Hervé Poussineau Keep the PC values as defaults but allow to override them for PReP. Signed-off-by: Hervé Poussineau Signed-off-by: Andreas Färber Reviewed-by: Markus Armbruster --- hw/fdc.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/hw/fdc.c b/hw/fdc.c index a0236b7..756d4ce 100644 --- a/hw/fdc.c +++ b/hw/fdc.c @@ -438,6 +438,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; @@ -1971,17 +1974,14 @@ 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; - isa_register_portio_list(dev, iobase, fdc_portio_list, fdctrl, "fdc"); + isa_register_portio_list(dev, isa->iobase, fdc_portio_list, fdctrl, "fdc"); - 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"); @@ -2046,6 +2046,9 @@ static const VMStateDescription vmstate_isa_fdc ={ }; static Property isa_fdc_properties[] = { + 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),