From patchwork Thu Feb 22 15:22:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 129271 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp722807lja; Thu, 22 Feb 2018 07:34:55 -0800 (PST) X-Google-Smtp-Source: AH8x226hxB5hZiA4YIw1MzgsllK3AV2kd6e9bqJU7/yR/KBjT4DBRJb21+R3+VvA0BpRm7qZKfmg X-Received: by 2002:a25:2608:: with SMTP id m8-v6mr4947006ybm.97.1519313695608; Thu, 22 Feb 2018 07:34:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519313695; cv=none; d=google.com; s=arc-20160816; b=vPSatBKScTTeYYMtIQoeDu4E85PpeAJeUoHPg+Wk+iSMq8lXmb8MLR35wEteDIpwUk iQmw10mhS4vqVg0WAwCPMLc/jjoa/nP/6S9o8zIHfX5WkgxFtb/SFH/dhRYEzhOozpgW LfGauIOsEMax6DrqZHLwgVmyO7mtCHajlhmZj7Xj6+XI5gwnPZpXe4gtmMeX30e0yjtk WMZhtoaush/WX5OtObxCtqQhrJu8vuwPHrvcrufXNnibWikkm60jwd261l5XdoUq5vrv eQ0D5ZRZXRpBlm7rMTPUC2ccRBeKQ81w/Bgnj09L+TflnzvHP2SkqksawRsXmfSxjN/q YuKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:arc-authentication-results; bh=YxhCBkn7ERrmJtFv6CQOggPUpAd+iJPQrPhsy+3tqyQ=; b=QD85IR7cE/09YceIQ2DguRSGfMOav53w3kFOJQwyQIcet1/YzooFxPx2t6agE9OTXN BrCT8c0RCCyHEEoaF2E8yisWUxjlBXWc5Lmu0xS2XVJZ5sR7p8+h1JXOJt+NNudssR00 Z+nMQ9UcJsiJrUSwaA9EYCsT25sdVoennPKMsH2K5z2ZHzo+sa5QijHOiTdWNLkAhX1Z kGnOYdO6Fj4baaCGmKOGFNBXZEQmUBxDX44bgxTbsmVBzg+y3PtYMadV9Nnnu1mMTeLe L7n2CJW50PpyVLjI8dOfs8lbZbaDQO8jq14xuvXuMy8rMwhSTia68591ReASI04vyHcE BdMg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id o128si51299ywf.227.2018.02.22.07.34.55 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 22 Feb 2018 07:34:55 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39026 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eosta-0006Hx-VU for patch@linaro.org; Thu, 22 Feb 2018 10:34:55 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38353) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eosiZ-0004kW-9D for qemu-devel@nongnu.org; Thu, 22 Feb 2018 10:23:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eosiY-0001dk-7c for qemu-devel@nongnu.org; Thu, 22 Feb 2018 10:23:31 -0500 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:46596) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eosiY-0001cp-0c for qemu-devel@nongnu.org; Thu, 22 Feb 2018 10:23:30 -0500 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from ) id 1eosiX-00022G-4C for qemu-devel@nongnu.org; Thu, 22 Feb 2018 15:23:29 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Date: Thu, 22 Feb 2018 15:22:44 +0000 Message-Id: <20180222152307.7499-10-peter.maydell@linaro.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180222152307.7499-1-peter.maydell@linaro.org> References: <20180222152307.7499-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2001:8b0:1d0::2 Subject: [Qemu-devel] [PULL 09/32] 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé place card registers first, this will ease further code movements. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Alistair Francis Message-id: 20180215220540.6556-2-f4bug@amsat.org Signed-off-by: Peter Maydell --- hw/sd/sd.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) -- 2.16.1 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; - 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;