From patchwork Tue Jan 22 12:39:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: BALATON Zoltan X-Patchwork-Id: 10776169 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3E2CF746 for ; Tue, 22 Jan 2019 19:35:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2D7712B838 for ; Tue, 22 Jan 2019 19:35:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 21F992B84B; Tue, 22 Jan 2019 19:35:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id BFF7B2B838 for ; Tue, 22 Jan 2019 19:35:40 +0000 (UTC) Received: from localhost ([127.0.0.1]:47999 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gm1pj-0001hm-VR for patchwork-qemu-devel@patchwork.kernel.org; Tue, 22 Jan 2019 14:35:40 -0500 Received: from eggs.gnu.org ([209.51.188.92]:53007) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gm1C2-0002SZ-GL for qemu-devel@nongnu.org; Tue, 22 Jan 2019 13:54:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gm1C0-0001BM-CI for qemu-devel@nongnu.org; Tue, 22 Jan 2019 13:54:38 -0500 Received: from zero.eik.bme.hu ([152.66.115.2]:16216) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gm1Bm-0000xC-1k; Tue, 22 Jan 2019 13:54:26 -0500 Received: from zero.eik.bme.hu (blah.eik.bme.hu [152.66.115.182]) by localhost (Postfix) with SMTP id 05CEC7456B2; Tue, 22 Jan 2019 13:55:55 +0100 (CET) Received: by zero.eik.bme.hu (Postfix, from userid 432) id 72AA87456B3; Tue, 22 Jan 2019 13:55:54 +0100 (CET) Message-Id: <47d854e0fa41dad6861107eac61327c247965566.1548160772.git.balaton@eik.bme.hu> In-Reply-To: References: From: BALATON Zoltan Date: Tue, 22 Jan 2019 13:39:32 +0100 To: qemu-devel@nongnu.org, qemu-block@nongnu.org X-detected-operating-system: by eggs.gnu.org: FreeBSD 9.x [fuzzy] X-Received-From: 152.66.115.2 Subject: [Qemu-devel] [PATCH 1/3] ide/via: Remove vt82c686b_init_ports() function X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: John Snow Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP This function is only called once from vt82c686b_ide_realize() and its content is simple enough to not need a separate function but be included in realize directly (as done in other IDE models except PIIX currently). Signed-off-by: BALATON Zoltan --- hw/ide/via.c | 44 ++++++++++++++++++++------------------------ 1 file changed, 20 insertions(+), 24 deletions(-) diff --git a/hw/ide/via.c b/hw/ide/via.c index 987d99c5ec..46cac7b8d6 100644 --- a/hw/ide/via.c +++ b/hw/ide/via.c @@ -32,6 +32,15 @@ #include "hw/ide/pci.h" #include "trace.h" +static const struct { + int iobase; + int iobase2; + int isairq; +} port_info[] = { + {0x1f0, 0x3f6, 14}, + {0x170, 0x376, 15}, +}; + static uint64_t bmdma_read(void *opaque, hwaddr addr, unsigned size) { @@ -143,34 +152,12 @@ static void via_reset(void *opaque) pci_set_long(pci_conf + 0xc0, 0x00020001); } -static void vt82c686b_init_ports(PCIIDEState *d) { - static const struct { - int iobase; - int iobase2; - int isairq; - } port_info[] = { - {0x1f0, 0x3f6, 14}, - {0x170, 0x376, 15}, - }; - int i; - - for (i = 0; i < 2; i++) { - ide_bus_new(&d->bus[i], sizeof(d->bus[i]), DEVICE(d), i, 2); - ide_init_ioport(&d->bus[i], NULL, port_info[i].iobase, - port_info[i].iobase2); - ide_init2(&d->bus[i], isa_get_irq(NULL, port_info[i].isairq)); - - bmdma_init(&d->bus[i], &d->bmdma[i], d); - d->bmdma[i].bus = &d->bus[i]; - ide_register_restart_cb(&d->bus[i]); - } -} - /* via ide func */ static void vt82c686b_ide_realize(PCIDevice *dev, Error **errp) { PCIIDEState *d = PCI_IDE(dev); uint8_t *pci_conf = dev->config; + int i; pci_config_set_prog_interface(pci_conf, 0x8a); /* legacy ATA mode */ pci_set_long(pci_conf + PCI_CAPABILITY_LIST, 0x000000c0); @@ -181,7 +168,16 @@ static void vt82c686b_ide_realize(PCIDevice *dev, Error **errp) vmstate_register(DEVICE(dev), 0, &vmstate_ide_pci, d); - vt82c686b_init_ports(d); + for (i = 0; i < 2; i++) { + ide_bus_new(&d->bus[i], sizeof(d->bus[i]), DEVICE(d), i, 2); + ide_init_ioport(&d->bus[i], NULL, port_info[i].iobase, + port_info[i].iobase2); + ide_init2(&d->bus[i], isa_get_irq(NULL, port_info[i].isairq)); + + bmdma_init(&d->bus[i], &d->bmdma[i], d); + d->bmdma[i].bus = &d->bus[i]; + ide_register_restart_cb(&d->bus[i]); + } } static void vt82c686b_ide_exitfn(PCIDevice *dev)