From nobody Tue Oct 28 04:17:44 2025 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 (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1515003401828601.1743402534487; Wed, 3 Jan 2018 10:16:41 -0800 (PST) Received: from localhost ([::1]:60067 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWnai-0006l4-Vp for importer@patchew.org; Wed, 03 Jan 2018 13:16:41 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47890) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWnT7-0000cm-H8 for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:08:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWnT6-00075O-KJ for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:08:49 -0500 Received: from mail-qk0-x243.google.com ([2607:f8b0:400d:c09::243]:39481) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWnT6-00075F-FT for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:08:48 -0500 Received: by mail-qk0-x243.google.com with SMTP id c5so2554477qkg.6 for ; Wed, 03 Jan 2018 10:08:48 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id 46sm914901qtx.65.2018.01.03.10.08.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Jan 2018 10:08:47 -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=lwCnM8T68G/5QwCZPQ6+Ioh1A/qfO9INOplwQdW/Po4=; b=jNonjlTQf05UQNZBTbST8+whtHR6CV4F9uFp/uEElYBtpdepp6IYGa4izMGL4RGAKx O65/jDO9wiWOZKGO4d3cwNamDWaaEQg63WihRaGvMJEAvnv9SwlvfrJAHLWqr9MWtoIH 1jIAnZa7N+XqXC8zGpQ2+4TaQRDiNti2e/exr42VPjPvsJ1o/VY2ITugEGQgAeUfwVlv Hq6TZZd/JHgx2J1CjxcFEdtzNnm+oWAT2fjGueExYdzHHuljDegBQMkO2AkLA8TqRCUq 0vvsuYqDpGiBLAxdbSVcog20YDJpaasDjheAXOVYNUY+oWuJ/dy0u6ohOZ8s0lXAgxU9 w95g== 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=lwCnM8T68G/5QwCZPQ6+Ioh1A/qfO9INOplwQdW/Po4=; b=lbOuZR43AHFkKcP4jXeIrr0PAWkWiw6+e5osTe23TFyUAGzalvceFZprhFJf78KpWR YTyTUwGh8sf+fOH8OA2Jju9UqgtzywDoDEHJHv27ThhFTzBP4evbtOh/21Fof0O6ADUg QJN2rNauEXN2XPZwNvXEzcj4Dbf9SaJmChknSUYbSuUGYvHzpzFhqpdqoZs0uqTta7Js jofAuOfEWUVJ+mDdFm+zzTclnAsN50pSSPnu0vF0LXAsTen1rxVy0AejjIWQWVuz1FPP 01QE+q6C/kp67xtegJsIevyBgfuM8HsnwEsAB3UlOot1FnC/Pvgoc2Dbi0MAnYdyeWlS E3lg== X-Gm-Message-State: AKGB3mKxsqZTeRD8mh2hPLt2dn6E+6NTmF8HraDEWQ8VittqtiwjFmwa d2nMbWweyCythEF1rUhDX/o= X-Google-Smtp-Source: ACJfBot2ZeuGUwL3pEJVR7GNCLCGzH6YxI0sikTIWqYemrDMnWO4ai4FsqKREgTQuqkF1NK1YwiOvA== X-Received: by 10.55.27.84 with SMTP id b81mr2832076qkb.26.1515002928112; Wed, 03 Jan 2018 10:08:48 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis Date: Wed, 3 Jan 2018 15:08:00 -0300 Message-Id: <20180103180805.18140-13-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180103180805.18140-1-f4bug@amsat.org> References: <20180103180805.18140-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 v5 12/17] sdhci: use FIELD_DP32() macro for the WRITE_PROTECT flag 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" , Peter Maydell , Fam Zheng , Eduardo Habkost , Andrey Smirnov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org 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 | 6 ++++-- hw/sd/sdhci.c | 8 ++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/hw/sd/sdhci-internal.h b/hw/sd/sdhci-internal.h index e941bc2386..df240ea046 100644 --- a/hw/sd/sdhci-internal.h +++ b/hw/sd/sdhci-internal.h @@ -24,6 +24,8 @@ #ifndef SDHCI_INTERNAL_H #define SDHCI_INTERNAL_H =20 +#include "hw/registerfields.h" + /* R/W SDMA System Address register 0x0 */ #define SDHC_SYSAD 0x00 =20 @@ -77,8 +79,8 @@ #define SDHC_SPACE_AVAILABLE 0x00000400 #define SDHC_DATA_AVAILABLE 0x00000800 #define SDHC_CARD_PRESENT 0x00010000 -#define SDHC_CARD_DETECT 0x00040000 -#define SDHC_WRITE_PROTECT 0x00080000 +FIELD(SDHC_PRNSTS, CARD_DETECT, 18, 1); +FIELD(SDHC_PRNSTS, WRITE_PROTECT, 19, 1); #define TRANSFERRING_DATA(x) \ ((x) & (SDHC_DOING_READ | SDHC_DOING_WRITE)) =20 diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index ede51d7e45..2c8dc66e7a 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -159,12 +159,8 @@ static void sdhci_set_readonly(DeviceState *dev, bool = level) { SDHCIState *s =3D (SDHCIState *)dev; =20 - if (level) { - s->prnsts &=3D ~SDHC_WRITE_PROTECT; - } else { - /* Write enabled */ - s->prnsts |=3D SDHC_WRITE_PROTECT; - } + /* Write enabled */ + s->prnsts =3D FIELD_DP32(s->prnsts, SDHC_PRNSTS, WRITE_PROTECT, level); } =20 static void sdhci_reset(SDHCIState *s) --=20 2.15.1