From nobody Thu Apr 25 23:10:51 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1547169997675150.7210639702298; Thu, 10 Jan 2019 17:26:37 -0800 (PST) Received: from localhost ([127.0.0.1]:49671 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ghlah-0007V8-M6 for importer@patchew.org; Thu, 10 Jan 2019 20:26:31 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38028) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ghlYr-0006R2-Sl for qemu-devel@nongnu.org; Thu, 10 Jan 2019 20:24:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ghlYq-0000tB-2i for qemu-devel@nongnu.org; Thu, 10 Jan 2019 20:24:37 -0500 Received: from zero.eik.bme.hu ([152.66.115.2]:50519) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ghlYo-0000lF-Bb for qemu-devel@nongnu.org; Thu, 10 Jan 2019 20:24:35 -0500 Received: from zero.eik.bme.hu (blah.eik.bme.hu [152.66.115.182]) by localhost (Postfix) with SMTP id 54CA27456CA; Fri, 11 Jan 2019 02:24:25 +0100 (CET) Received: by zero.eik.bme.hu (Postfix, from userid 432) id B12917456C9; Fri, 11 Jan 2019 02:24:24 +0100 (CET) Message-Id: <793b6a7934ef2bba26b8d066bec446019efa6c5d.1547166960.git.balaton@eik.bme.hu> In-Reply-To: References: From: BALATON Zoltan Date: Fri, 11 Jan 2019 01:36:00 +0100 To: qemu-devel@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 5/5] sii3112: Remove duplicated code and use PCI IDE ops instead 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: Mark Cave-Ayland , John Snow , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Parts of the SiI3112 mmio are identical to PCI IDE registers so we can use the corresponding functions that were factored out into ide/pci.c. This removes code duplication and simplifies the SiI3112 model which also helped to spot a copy paste error where reading status of the 2nd channel read the 1st channel instead. This is also fixed here. Signed-off-by: BALATON Zoltan --- hw/ide/sii3112.c | 52 ++++++++-------------------------------------------- 1 file changed, 8 insertions(+), 44 deletions(-) diff --git a/hw/ide/sii3112.c b/hw/ide/sii3112.c index 743a50ed51..59db09cfe4 100644 --- a/hw/ide/sii3112.c +++ b/hw/ide/sii3112.c @@ -88,35 +88,19 @@ static uint64_t sii3112_reg_read(void *opaque, hwaddr a= ddr, val |=3D (uint32_t)d->i.bmdma[1].status << 16; break; case 0x80 ... 0x87: - if (size =3D=3D 1) { - val =3D ide_ioport_read(&d->i.bus[0], addr - 0x80); - } else if (addr =3D=3D 0x80) { - val =3D (size =3D=3D 2) ? ide_data_readw(&d->i.bus[0], 0) : - ide_data_readl(&d->i.bus[0], 0); - } else { - val =3D (1ULL << (size * 8)) - 1; - } + val =3D pci_ide_data_le_ops.read(&d->i.bus[0], addr - 0x80, size); break; case 0x8a: - val =3D (size =3D=3D 1) ? ide_status_read(&d->i.bus[0], 4) : - (1ULL << (size * 8)) - 1; + val =3D pci_ide_cmd_le_ops.read(&d->i.bus[0], 2, size); break; case 0xa0: val =3D d->regs[0].confstat; break; case 0xc0 ... 0xc7: - if (size =3D=3D 1) { - val =3D ide_ioport_read(&d->i.bus[1], addr - 0xc0); - } else if (addr =3D=3D 0xc0) { - val =3D (size =3D=3D 2) ? ide_data_readw(&d->i.bus[1], 0) : - ide_data_readl(&d->i.bus[1], 0); - } else { - val =3D (1ULL << (size * 8)) - 1; - } + val =3D pci_ide_data_le_ops.read(&d->i.bus[1], addr - 0xc0, size); break; case 0xca: - val =3D (size =3D=3D 1) ? ide_status_read(&d->i.bus[0], 4) : - (1ULL << (size * 8)) - 1; + val =3D pci_ide_cmd_le_ops.read(&d->i.bus[1], 2, size); break; case 0xe0: val =3D d->regs[1].confstat; @@ -186,36 +170,16 @@ static void sii3112_reg_write(void *opaque, hwaddr ad= dr, bmdma_addr_ioport_ops.write(&d->i.bmdma[1], addr - 12, val, size); break; case 0x80 ... 0x87: - if (size =3D=3D 1) { - ide_ioport_write(&d->i.bus[0], addr - 0x80, val); - } else if (addr =3D=3D 0x80) { - if (size =3D=3D 2) { - ide_data_writew(&d->i.bus[0], 0, val); - } else { - ide_data_writel(&d->i.bus[0], 0, val); - } - } + pci_ide_data_le_ops.write(&d->i.bus[0], addr - 0x80, val, size); break; case 0x8a: - if (size =3D=3D 1) { - ide_cmd_write(&d->i.bus[0], 4, val); - } + pci_ide_cmd_le_ops.write(&d->i.bus[0], 2, val, size); break; case 0xc0 ... 0xc7: - if (size =3D=3D 1) { - ide_ioport_write(&d->i.bus[1], addr - 0xc0, val); - } else if (addr =3D=3D 0xc0) { - if (size =3D=3D 2) { - ide_data_writew(&d->i.bus[1], 0, val); - } else { - ide_data_writel(&d->i.bus[1], 0, val); - } - } + pci_ide_data_le_ops.write(&d->i.bus[1], addr - 0xc0, val, size); break; case 0xca: - if (size =3D=3D 1) { - ide_cmd_write(&d->i.bus[1], 4, val); - } + pci_ide_cmd_le_ops.write(&d->i.bus[1], 2, val, size); break; case 0x100: d->regs[0].scontrol =3D val & 0xfff; --=20 2.13.7