From nobody Wed Feb 11 08:37:33 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of _spf.google.com designates 209.85.216.193 as permitted sender) client-ip=209.85.216.193; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-qt0-f193.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of _spf.google.com designates 209.85.216.193 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-qt0-f193.google.com (mail-qt0-f193.google.com [209.85.216.193]) by mx.zohomail.com with SMTPS id 1518732352350426.1577014046579; Thu, 15 Feb 2018 14:05:52 -0800 (PST) Received: by mail-qt0-f193.google.com with SMTP id u6so1566975qtg.13 for ; Thu, 15 Feb 2018 14:05:52 -0800 (PST) Return-Path: Return-Path: Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id h200sm6330991qke.66.2018.02.15.14.05.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Feb 2018 14:05:50 -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=54fkFQXzwjNPGC+rwH2lxhIE9uTNrdNFSpweKHHdsoc=; b=FqXsLcXSTR4UlpCvmBx2LiWdPXtTM7egOFA3zwB5TSgPt1AHj/t13JxADf00TS8ZZb QsJ8ufJlAZvDB4pz+Q2tj1aj5XRQ01wtGt5moIiD0K8RedLBEsRfMRiVv/rD6w9qf3nF uqcWIZf6kwrwtXs3Iv1u+z4DRu45PV/ZB1DVO+0Q++HTmOdcvFGQYwgjfg4BjaXkMgv7 2sgmrzipFajAlk2UMbrBdLQWX68NEGbXw561TpTuObxhJqOE42AZZ5C04EbhWqjpXA14 aL2W8gTCoN5fTvj/ZJg7T6CdrgPuHCOizqiIgJEBXaxBQ0rorfEIf16siB3jsoDedA9s KrTw== 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=54fkFQXzwjNPGC+rwH2lxhIE9uTNrdNFSpweKHHdsoc=; b=O6GxaD7W0KCTqvCOIRLincMXt3nO9yeDqXviY34vljMoNuUTqLS5+an2+IL9htsBBn cQa9oMRy65rgZKdToGA8UrC+XxBL3H0K6rv4HfgTzNgi30ZNj7d+xyR36hswQ+Y/tnyx llzWpYaX3h8gBOFWlBHIy23WoQN0dPr7PYMa5sUvv6wsVeHK2rDgm4PzvfTROR1M/4JP wq6g7JnQenyPjVI7E3DVWkXYNex4Q1esDM7LtISgDDcGd/9DEnrf/MY5ewrbWk9t9XrE wtxpNwZOV6XkZpBT9F6/F8EuhCI53uW8q54RHNhYxXJNJfoi7aoanp9SHM9RHO6C2ki/ WPkw== X-Gm-Message-State: APf1xPAP/Hgb+5QxfTGuMslyWWpJ1UQ/HbEIBtTADoZ7V63NLHpaNDGo +/CpU25L2TtQU7KkMRn2pp0= X-Google-Smtp-Source: AH8x224rwTUIx8ne7aC/uqh0Nci3zUIzfjrMmEfcxljCy0602jgzhSsZjrIVHUrfjdKn9PuKafSuyw== X-Received: by 10.237.41.129 with SMTP id o1mr6718550qtd.2.1518732351449; Thu, 15 Feb 2018 14:05:51 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , Peter Maydell , Igor Mitsyanko Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, "Edgar E . Iglesias" , Prasad J Pandit , Andrzej Zaborowski Subject: [PATCH v4 01/11] sdcard: reorder SDState struct members Date: Thu, 15 Feb 2018 19:05:30 -0300 Message-Id: <20180215220540.6556-2-f4bug@amsat.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180215220540.6556-1-f4bug@amsat.org> References: <20180215220540.6556-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZohoMail: RDKM_0 RSF_0 Z_629925259 SPT_0 place card registers first, this will ease further code movements. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis --- hw/sd/sd.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 9ac9b63ff8..ce1f2fdf76 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -88,16 +88,21 @@ enum SDCardStates { struct SDState { DeviceState parent_obj; =20 - uint32_t mode; /* current card mode, one of SDCardModes */ - int32_t state; /* current card state, one of SDCardStates */ + /* SD Memory Card Registers */ 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]; + + /* Configurable properties */ + BlockBackend *blk; + bool spi; + + uint32_t mode; /* current card mode, one of SDCardModes */ + int32_t state; /* current card state, one of SDCardStates */ uint32_t vhs; bool wp_switch; unsigned long *wp_groups; @@ -110,8 +115,6 @@ struct SDState { uint8_t pwd[16]; uint32_t pwd_len; uint8_t function_group[6]; - - bool spi; uint8_t current_cmd; /* True if we will handle the next command as an ACMD. Note that this = does * *not* track the APP_CMD status bit! @@ -123,8 +126,7 @@ struct SDState { uint8_t data[512]; qemu_irq readonly_cb; qemu_irq inserted_cb; - BlockBackend *blk; - + QEMUTimer *ocr_power_timer; bool enable; uint8_t dat_lines; bool cmd_line; --=20 2.16.1