From nobody Tue Feb 10 18:56:46 2026 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=ilande.co.uk Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1686336786728515.4247213029078; Fri, 9 Jun 2023 11:53:06 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q7hD6-0000xc-Bh; Fri, 09 Jun 2023 14:51:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q7hD1-0000wW-MS; Fri, 09 Jun 2023 14:51:39 -0400 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q7hD0-0002pa-6a; Fri, 09 Jun 2023 14:51:39 -0400 Received: from [2a00:23c4:8bac:6900:b726:cf58:4c12:f013] (helo=kentang.home) by mail.ilande.co.uk with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1q7hCq-0000p5-4p; Fri, 09 Jun 2023 19:51:32 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=ilande.co.uk; s=20220518; h=Subject:Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:To:From:Sender:Reply-To:Cc: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=+zG1+zsLiApFxKVTbKvT2753to4bpAB1vEbcK9znN+g=; b=B+0HE1CDZ+DGeWLRZ4z+KAWMfa onPUEe3Nn8pp5lhL3LNwLGYWUSy5qyKABfOsqt9eUIXbRts6MbcoOWPC0EgIUiYm4SrUQ5Ay0jCOB V+sU4dfjm5ylpSfztxHnl5rYi3HyvUxRd5+h8y5cPrpg+baCoWd5odPYJuleDWlm+TqVvJNLBoHcy WrsyJDx4qS0+dgYdNqEUPn5jrOQuvxiarPC8vbmWDxe0z2XpWLCq2U8xv47Z4Qkrb9YRxGTPpE/xL wvY8DWjXzUBwMnqYKabfVla0E+AjhEh1RyOl5SIFlhqMbRZY/ur4dy90xOZRgSiM8jfmAw6XTC+qM u1VcrICj8kvG3Bi7L7VnLLdemyJnB9y4lbZOJ9oK3W/R6mG1itNs5oW+I/2T0Scc+q46fVxJqSsU5 d4FCLncoTkz4N93EWQQ2UCllyjs7aW7JO85QGZY79yvjxV8kZ8AL5ygTbG9kwvOY5jWY9+A/Op0L4 e5knnH0BPAt89r/JrbnzOH2PlaHynstSp3tmC+9sWqWgqxMFySL1geOmknDgjwFSsVg9jNN6KhuR2 3JVoqt5RO/kj7MWf8uoiDCK8Vm2JbN3jdRT2op7uSzv32+0e2wSZ4X0sw8IIs+zD0gKcQA7ClE6Xo +/m6kMabjFJZzhwJIxOmnOn1w+mElvssvHGvxQONw=; From: Mark Cave-Ayland To: jsnow@redhat.com, shentey@gmail.com, qemu-devel@nongnu.org, qemu-block@nongnu.org Date: Fri, 9 Jun 2023 19:51:15 +0100 Message-Id: <20230609185119.691152-2-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230609185119.691152-1-mark.cave-ayland@ilande.co.uk> References: <20230609185119.691152-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 2a00:23c4:8bac:6900:b726:cf58:4c12:f013 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH 1/5] cmd646: checkpatch fixes X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.ilande.co.uk) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2001:41c9:1:41f::167; envelope-from=mark.cave-ayland@ilande.co.uk; helo=mail.ilande.co.uk X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1686336787621100013 Content-Type: text/plain; charset="utf-8" Signed-off-by: Mark Cave-Ayland Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/ide/cmd646.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c index a68357c1c5..20f1e41d57 100644 --- a/hw/ide/cmd646.c +++ b/hw/ide/cmd646.c @@ -96,7 +96,7 @@ static uint64_t bmdma_read(void *opaque, hwaddr addr, return ((uint64_t)1 << (size * 8)) - 1; } =20 - switch(addr & 3) { + switch (addr & 3) { case 0: val =3D bm->cmd; break; @@ -133,7 +133,7 @@ static void bmdma_write(void *opaque, hwaddr addr, } =20 trace_bmdma_write_cmd646(addr, val); - switch(addr & 3) { + switch (addr & 3) { case 0: bmdma_cmd_writeb(bm, val); break; @@ -144,7 +144,8 @@ static void bmdma_write(void *opaque, hwaddr addr, cmd646_update_irq(pci_dev); break; case 2: - bm->status =3D (val & 0x60) | (bm->status & 1) | (bm->status & ~va= l & 0x06); + bm->status =3D (val & 0x60) | (bm->status & 1) | + (bm->status & ~val & 0x06); break; case 3: if (bm =3D=3D &bm->pci_dev->bmdma[0]) { @@ -167,7 +168,7 @@ static void bmdma_setup_bar(PCIIDEState *d) int i; =20 memory_region_init(&d->bmdma_bar, OBJECT(d), "cmd646-bmdma", 16); - for(i =3D 0;i < 2; i++) { + for (i =3D 0; i < 2; i++) { bm =3D &d->bmdma[i]; memory_region_init_io(&bm->extra_io, OBJECT(d), &cmd646_bmdma_ops,= bm, "cmd646-bmdma-bus", 4); @@ -255,7 +256,7 @@ static void pci_cmd646_ide_realize(PCIDevice *dev, Erro= r **errp) =20 pci_conf[PCI_CLASS_PROG] =3D 0x8f; =20 - pci_conf[CNTRL] =3D CNTRL_EN_CH0; // enable IDE0 + pci_conf[CNTRL] =3D CNTRL_EN_CH0; /* enable IDE0 */ if (d->secondary) { /* XXX: if not enabled, really disable the seconday IDE controller= */ pci_conf[CNTRL] |=3D CNTRL_EN_CH1; /* enable IDE1 */ @@ -289,7 +290,7 @@ static void pci_cmd646_ide_realize(PCIDevice *dev, Erro= r **errp) pci_register_bar(dev, 4, PCI_BASE_ADDRESS_SPACE_IO, &d->bmdma_bar); =20 /* TODO: RST# value should be 0 */ - pci_conf[PCI_INTERRUPT_PIN] =3D 0x01; // interrupt on pin 1 + pci_conf[PCI_INTERRUPT_PIN] =3D 0x01; /* interrupt on pin 1 */ =20 qdev_init_gpio_in(ds, cmd646_set_irq, 2); for (i =3D 0; i < 2; i++) { --=20 2.30.2