From nobody Tue Feb 10 15:45:35 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1516041162313803.6123800499371; Mon, 15 Jan 2018 10:32:42 -0800 (PST) Received: from localhost ([::1]:53268 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eb9Yg-0005uo-5p for importer@patchew.org; Mon, 15 Jan 2018 13:32:34 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60193) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eb9Rh-00009j-Gh for qemu-devel@nongnu.org; Mon, 15 Jan 2018 13:25:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eb9Rf-0003E6-Lu for qemu-devel@nongnu.org; Mon, 15 Jan 2018 13:25:21 -0500 Received: from mail-qk0-x243.google.com ([2607:f8b0:400d:c09::243]:34707) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eb9Rf-0003Dx-Hb for qemu-devel@nongnu.org; Mon, 15 Jan 2018 13:25:19 -0500 Received: by mail-qk0-x243.google.com with SMTP id b76so17946927qkc.1 for ; Mon, 15 Jan 2018 10:25:19 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id d20sm154623qtn.23.2018.01.15.10.25.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Jan 2018 10:25:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LDtKIWHN8tFeNSIxHxx0aJrxWMlR9HZ4xcbVHkWmiac=; b=cirF8s5Z7KPloKGmWvLanGq86rBsEraDQtt4b6dhPW1V6nA8As2EdCxfuAa3n64Mze Ic48dFoinOtfl188kYazMIoNDq4x11xdn6Ui5r3OxVAQgVpSXUVkvIxRlaJLGuvI58XV FRiZW0v8VeSqV2kdgEjS76DoHUpypT5u8+eFGghck3WF/a0hGmD8zD+0JiXU309/gMjS M0/V24i56egeHPX8mer9LkYJIrOQEiCU28IM8W//+WoajEuWKxtwQmv+Iq5c/pF2s7f+ BVDbCYow/0itwI8wIAu2T+QdORt1vVvIGEPThygKTCvVcX4xJ3XI5jggJzKfBf9488HK Qm0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=LDtKIWHN8tFeNSIxHxx0aJrxWMlR9HZ4xcbVHkWmiac=; b=oWmcYwnR96JAmYZNMyYPP2CE6r+qhpOlUCQ0RuZigRrXfL4XYaDRUOnLTLRKps5mFn MOywysGu0Ob7l8AQtqRJQrmwW+qrLVJt31rd0j0YOs20w3ZAWvcg7Ld1xI59Az3OW2UI 9cb3/9hO21Qeh4oUatDaAEHB3Arkz2RWadut335BwOK797TxEb2q1a9HAGFDHeeFW3Jw UPfbMNRvuXKdg8RoMSELMflfPkvIqShizEdzSaLnXr2DrIV7TKtNfAujZNurGOIgNYW+ RIXnbpwa9UvwOx3bb9qlW1eGdYC5BIOD0PfRN2dbIH+NEBHw7aAb6TutLew3ymDFqOPe tFcw== X-Gm-Message-State: AKwxytfpf0PUiSZa1b5il+sRc6nLStL3+conTx5UO8Vts8zwQpCnzO8N t873r6+0KM9mRXKCKCKJYYg= X-Google-Smtp-Source: ACJfBotKW2G/DcPBi1K63vT061t5+lgq3cX+kv8XB8wFws/2388qSd6Yfj8HuYr1Gokn4xTFV2dByw== X-Received: by 10.55.168.137 with SMTP id r131mr39700644qke.27.1516040719125; Mon, 15 Jan 2018 10:25:19 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Paolo Bonzini , Alistair Francis , Peter Maydell Date: Mon, 15 Jan 2018 15:24:31 -0300 Message-Id: <20180115182436.2066-10-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180115182436.2066-1-f4bug@amsat.org> References: <20180115182436.2066-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::243 Subject: [Qemu-devel] [PATCH v8 09/14] sdhci: move MASK_TRNMOD with other SDHC_TRN* defines in "sd-internal.h" 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: "Edgar E . Iglesias" , Andrey Smirnov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Kevin O'Connor , Marcel Apfelbaum Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis --- hw/sd/sdhci-internal.h | 1 + hw/sd/sdhci.c | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/sd/sdhci-internal.h b/hw/sd/sdhci-internal.h index 248fd027f9..e941bc2386 100644 --- a/hw/sd/sdhci-internal.h +++ b/hw/sd/sdhci-internal.h @@ -43,6 +43,7 @@ #define SDHC_TRNS_ACMD12 0x0004 #define SDHC_TRNS_READ 0x0010 #define SDHC_TRNS_MULTI 0x0020 +#define SDHC_TRNMOD_MASK 0x0037 =20 /* R/W Command Register 0x0 */ #define SDHC_CMDREG 0x0E diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 68f1aee5dc..4265b6a20e 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -99,7 +99,6 @@ (SDHC_CAPAB_BASECLKFREQ << 8) | (SDHC_CAPAB_TOUNIT << 7) | \ (SDHC_CAPAB_TOCLKFREQ)) =20 -#define MASK_TRNMOD 0x0037 #define MASKED_WRITE(reg, mask, val) (reg =3D (reg & (mask)) | (val)) =20 static uint8_t sdhci_slotint(SDHCIState *s) @@ -1026,7 +1025,7 @@ sdhci_write(void *opaque, hwaddr offset, uint64_t val= , unsigned size) if (!(s->capareg & SDHC_CAN_DO_DMA)) { value &=3D ~SDHC_TRNS_DMA; } - MASKED_WRITE(s->trnmod, mask, value & MASK_TRNMOD); + MASKED_WRITE(s->trnmod, mask, value & SDHC_TRNMOD_MASK); MASKED_WRITE(s->cmdreg, mask >> 16, value >> 16); =20 /* Writing to the upper byte of CMDREG triggers SD command generat= ion */ --=20 2.15.1