From nobody Tue Feb 10 16:22:26 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 1516677824980752.572146604976; Mon, 22 Jan 2018 19:23:44 -0800 (PST) Received: from localhost ([::1]:59017 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1edpBU-0004gJ-AS for importer@patchew.org; Mon, 22 Jan 2018 22:23:40 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35394) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1edp9d-0003Op-JS for qemu-devel@nongnu.org; Mon, 22 Jan 2018 22:21:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1edp9c-0000LO-P6 for qemu-devel@nongnu.org; Mon, 22 Jan 2018 22:21:45 -0500 Received: from mail-qt0-x241.google.com ([2607:f8b0:400d:c0d::241]:46490) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1edp9c-0000Kq-KC for qemu-devel@nongnu.org; Mon, 22 Jan 2018 22:21:44 -0500 Received: by mail-qt0-x241.google.com with SMTP id o35so26410030qtj.13 for ; Mon, 22 Jan 2018 19:21:44 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id x207sm5545567qka.91.2018.01.22.19.21.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Jan 2018 19:21:43 -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=CKNsnSZgZnc4oI+jwgKiD1HK1Cd1VWRKlF7rHcUO5WI=; b=m07wg05jvJ8KG3o34nKPVwNZb7ZRzXji0uGa1M15kWVfI+BeVyGUpYUD4T/uNhLPJ2 98zcKP+ddoGSSMYtIxSRbfYIv0OBTfP8c2A0S3v7SS70N24e5yMnorimH+dBe3NR4k6d gCw1JlmqJ5xkquWcFN1BSzw60VY5dHj7JvEED7t7YY+PDwxqxy54WqGO3cjE+HwGMJjJ nY3fWVjRr9bLqrd2T2Od+A3rQABCvsFDtbJVQkFYnJ00vPKcUMdBdaTi8/Fbv/sFaVFU h/P9Uj95iD9ehIjm1c7hMfo+pN5iMGXU4rsAUfz1duo6DIWuMgBzGl4s0LaGQhr2P1Lv 3ndw== 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=CKNsnSZgZnc4oI+jwgKiD1HK1Cd1VWRKlF7rHcUO5WI=; b=RfOB0S94octuE7u1/7ZJalXNGBGal81OqY0Pl8+K9jbUCuu3tdmgtviZnptu8oC08S /ZebJG7NUG+QeZZDOZFMdxSmEUoqX1FhO0yp28cFIJ9fQwA6Kge5A9usffjNn6vHnVIZ S8HpSJIrYTcMdvWTyI+OVMgyben4TKjIV52VckhIwkhzdKz0DZ7e8hyAgpvyx0RYvrDR S2WAUt2nF9EjEKnzJxOx3uYQ4wnGDf53hexKxhQhnSy+QPhmRwn16oKU0pfvq6FM5VRW JM/m+mWXl1K8gC4mQdvW8XlUHqULr0N99eeKcvmy1T3vB5qPzdPLH7wKxraWxcQ+9o+1 0nmg== X-Gm-Message-State: AKwxyte95PwQPLruL1x3n5FlZFyrjzppdDdmrgIDvE0o1piBJbe76xBf gBgr9zuNr7hpYBNGZINXGhM= X-Google-Smtp-Source: AH8x2244p2ajW3qqop+nUZ7P0/sDkuYCfWf1XgCxgBWToPWeKSzpiIqkMXEonafq9oV/0jJzSaR38Q== X-Received: by 10.200.47.17 with SMTP id j17mr1558339qta.199.1516677704182; Mon, 22 Jan 2018 19:21:44 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , Peter Maydell , Igor Mitsyanko Date: Tue, 23 Jan 2018 00:21:24 -0300 Message-Id: <20180123032135.28863-2-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180123032135.28863-1-f4bug@amsat.org> References: <20180123032135.28863-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 v3 01/12] sdcard: reorder SDState struct members 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" , Prasad J Pandit , 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 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 ab9be561d2..55d2ba2dd7 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.15.1