From nobody Mon Feb 9 22:38:32 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 (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1513208526849309.8880120467421; Wed, 13 Dec 2017 15:42:06 -0800 (PST) Received: from localhost ([::1]:38338 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ePGez-0003nF-0D for importer@patchew.org; Wed, 13 Dec 2017 18:41:57 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32852) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ePGMl-0006D2-J4 for qemu-devel@nongnu.org; Wed, 13 Dec 2017 18:23:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ePGMk-00004w-JA for qemu-devel@nongnu.org; Wed, 13 Dec 2017 18:23:07 -0500 Received: from mail-qt0-x241.google.com ([2607:f8b0:400d:c0d::241]:44704) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ePGMk-0008WM-EL for qemu-devel@nongnu.org; Wed, 13 Dec 2017 18:23:06 -0500 Received: by mail-qt0-x241.google.com with SMTP id m59so5833149qte.11 for ; Wed, 13 Dec 2017 15:23:06 -0800 (PST) Received: from x1.local ([181.91.222.165]) by smtp.gmail.com with ESMTPSA id l1sm1666918qkk.74.2017.12.13.15.23.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Dec 2017 15:23:05 -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=tX31OcXS7Drbe9tKzbdZdIUHcFVQLJqeVGAjVvWuxas=; b=EbW7pcO8MRZyAclXWjB8APzcSvtaw7Z/MaonA9Sag2bWbfiVS8m75hictL8BG+5HEj yUPw0Sa1blPRzCw9jk+KNRLNN6Cz78llahFgIE2eey8dYQ2PtYk1jSxyWtQKtxkFSqam zCYNSAr/YfGO7W8huoO+qijYPodpoGNzKPl9py5Gl7sTU+Z6xZagPs21nK+W6owY71Xa MziDVy0imXlk4em4k6gNZj0oRH+7Ggw6/5nIfxdqBH/3NtEmueAk3gPsosk0M3HYD27a 1AHgY7fZQ7ohen8ZSu2C3jOFd2ESugzo+vCf1MiB/3z2gObQlEXlgOb2zATaHecUm8+7 0MSw== 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=tX31OcXS7Drbe9tKzbdZdIUHcFVQLJqeVGAjVvWuxas=; b=iq5adZSZCdfOJ3nTFyPScvUjmupYhUR4PCzTOWo7S/7129+aISyTL0iE7BKM1oivHz 1q43zqfW9Hoq3fOc3W9hSkcEWvWzSxhCxH+lUVqOxHV+gPUU7KqgOdPBgQVgg6H41SQY BJZ30I7hlU65qeH0QFGgtOP9SqCFI5i8foGjQZJNsI6T6fJ+rQpkdQ7obWM9L6nkY4aX g4vptsQzshz48BlS8yttzX/ivFqwztXD2fKykZaq1gu2nXSM/VEv+Xus2B+ix+5Ul/FN 0Ps84aTLA5XTOe6hKOC7ozmYFx4+W/L9aoKH1sTrtrB5spZqaFI4RoPA7dcHWpqmcrt7 ywdQ== X-Gm-Message-State: AKGB3mKUwKM9/diBVarRPigbGUat4tSgwMSXgj8ol3yhEf4VHQSaPixB J+YbdnIy4rfvLDkythwxVZhkCEq7BXk= X-Google-Smtp-Source: ACJfBovW2wBoHgny4ZyO2GYaLpoeXms5EzyAAGkp0D5XKveEn3fwBSN0slrF40NK2SnzYZyizXMkDg== X-Received: by 10.200.38.133 with SMTP id 5mr14144500qto.317.1513207386072; Wed, 13 Dec 2017 15:23:06 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , "Edgar E . Iglesias" , Peter Maydell , Andrew Baumann , Prasad J Pandit , Clement Deschamps Date: Wed, 13 Dec 2017 20:20:17 -0300 Message-Id: <20171213232025.24503-19-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20171213232025.24503-1-f4bug@amsat.org> References: <20171213232025.24503-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::241 Subject: [Qemu-devel] [PATCH 18/26] sdcard: move Memory Card registers together 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: Sai Pavan Boddu , Peter Crosthwaite , =?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 Aesthetic, but ease review. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/sd/sd.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index d8e3f60536..992236df75 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -85,14 +85,17 @@ struct SDState { =20 uint32_t mode; /* current card mode, one of SDCardModes */ int32_t state; /* current card state, one of SDCardStates */ - uint32_t ocr; QEMUTimer *ocr_power_timer; - uint8_t scr[8]; - uint8_t cid[16]; - uint8_t csd[16]; - uint16_t rca; - uint32_t card_status; - uint8_t sd_status[64]; + + /* SD Memory Card Registers */ + uint8_t cid[128 / BITS_PER_BYTE]; /* Card Identification Number = */ + uint16_t rca; /* Relative Card Address */ + uint8_t csd[128 / BITS_PER_BYTE]; /* Card Specific Data */ + uint8_t scr[64 / BITS_PER_BYTE]; /* SD Configuration */ + uint32_t ocr; /* Operation Conditions */ + uint8_t sd_status[512 / BITS_PER_BYTE]; /* SD Status */ + uint32_t card_status; /* Card Status */ + uint32_t vhs; bool wp_switch; unsigned long *wp_groups; --=20 2.15.1