From nobody Tue Oct 28 12:16:34 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 1514977708193477.55623045551283; Wed, 3 Jan 2018 03:08:28 -0800 (PST) Received: from localhost ([::1]:48692 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWguI-0008P3-7K for importer@patchew.org; Wed, 03 Jan 2018 06:08:26 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47953) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWgoE-0003H9-EN for qemu-devel@nongnu.org; Wed, 03 Jan 2018 06:02:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWgoD-00061O-Oa for qemu-devel@nongnu.org; Wed, 03 Jan 2018 06:02:10 -0500 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:39883) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWgoD-000614-L5 for qemu-devel@nongnu.org; Wed, 03 Jan 2018 06:02:09 -0500 Received: by mail-qt0-x243.google.com with SMTP id k19so1631632qtj.6 for ; Wed, 03 Jan 2018 03:02:09 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id r55sm417735qta.57.2018.01.03.03.02.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Jan 2018 03:02:08 -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=qeaG/l5+qSKwrMY6GXhQAOweIqyZAficuK8mHm6AnvM=; b=DphKeY/epq8LQ9B7J+U6yK4vrrQuPtkTVXxIxvip5cIAACztrRleHon2dz4lUaIk1M KlWLs2RZilCZ8P/yBl2QcZl5SXWYOC/dgoW0WUGCGOkEheOcfyAtUtd7Cu/8hDIrKA5y jwqLHBOhwdUcE+pymyNDbJOAL9ZsUiSYh36mplPuA/s8WHWcQXqOw0lKt9RliVsVvb3R L48ztujw9+rvsq6VboFudsM24WUbru6osjY6icAWve6rp3bAAZ/wMnKt7qz2raVRGXU1 Cfxu0UCIhAp+/m3GmJ8ucfT7gGBxaZlcR1nhrRNdHEzHnsf4mgPBfs02f2x7P9Z3QX+x QfQQ== 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=qeaG/l5+qSKwrMY6GXhQAOweIqyZAficuK8mHm6AnvM=; b=JTIevy3JwyD9tpplRJF+BgG2rkYp3EzRZ48au/GVA8JX6aVaPpnKh5vISsdx3mDwZ6 3Zx3AqBy/QFJkBr4czMurQ/W2Sm77cWviuwlPvA22sFyRfV7vTCEo6m4f9POnMKU0V8G 9fyHZVMhS06r0b01dFxc0MsazkgHZ4if/3ZvJO5UUICQzO63rmcZ2fFRoIZHYdMERjrs cM6x+FS8CzLeGUCyjfeWe68RU4Am9l4W852G+dfjaXjtl2yjI4KJMmWZpzysHJHwtl7u olFuQEVLPH+XSOihYV8Yjw2PiObC1+yrnxBulQAYuBfZQ/wW3w6TlULhEfQaP+kCE3+T 4ZVw== X-Gm-Message-State: AKGB3mJL/yhWy5mlc+5JMz8yM0fWYsdZiNbtlOxQYc95XIlK6RS/P4y5 OA3nu9KJETmDyFMBCf2sFGI= X-Google-Smtp-Source: ACJfBouPElTOPCJhmqNKqTuF76PUkc+LGU/NKQfrJFafLH7nx776lP5yMVbxl5r0y7P1PGjiY/kCGQ== X-Received: by 10.200.40.189 with SMTP id i58mr1198720qti.128.1514977329125; Wed, 03 Jan 2018 03:02:09 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , Fam Zheng Date: Wed, 3 Jan 2018 08:01:21 -0300 Message-Id: <20180103110126.29209-13-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180103110126.29209-1-f4bug@amsat.org> References: <20180103110126.29209-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:c0d::243 Subject: [Qemu-devel] [PATCH v4 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 , 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 --- 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 dd42820a38..586db181e3 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -160,12 +160,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