From nobody Wed Feb 11 08:38:11 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of _spf.google.com designates 209.85.220.196 as permitted sender) client-ip=209.85.220.196; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-qk0-f196.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of _spf.google.com designates 209.85.220.196 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-qk0-f196.google.com (mail-qk0-f196.google.com [209.85.220.196]) by mx.zohomail.com with SMTPS id 1518732388691359.20219497151027; Thu, 15 Feb 2018 14:06:28 -0800 (PST) Received: by mail-qk0-f196.google.com with SMTP id z197so1546373qkb.6 for ; Thu, 15 Feb 2018 14:06:28 -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.06.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Feb 2018 14:06:26 -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=8sdW/3mmjLRuCjGpul+6/RCCzMqxUBA24KahfCjrdyA=; b=oRL/jK+mhceiXbKyaDXpWmpRvOT2b3K4+VXO9t9H1Kg9/SgS/U1ez4es7eFIms3ZQQ 2R6PF3F96P93UcB/81fFiMXVy9I1olererXlxetY6auAa6yufqGRsiXrQK6V4Ly/sZZf czYVHc0Vp4RAY2cnpIxXz3edYEgP14xxzRfFK5UakSC7PaZgEsvDEo77wck2jZXBbq9e B9LdnYisC1LnWzquLRbB/R6P28G+ugJv8PWW4GsFGcPYj3VWWMpaotXhnPkPARy396wo 2foNj2px0DYTXpe/LTwT528+5o00786VARQqeQfZfbDtwM1iBEGki/WYKKcw6Z+n3U53 q3Jg== 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=8sdW/3mmjLRuCjGpul+6/RCCzMqxUBA24KahfCjrdyA=; b=KEJfnQ8lGILovLkRg9Dc46OheH6R+Cdm2N4muEf4obi+gcbYewXK9IoMe+zCftlo48 ic0WvGN8uhlw3+Z33geCJeWZrMM4xe1w77f1bdSSYLP5mI7VkSVNDL6uX0N5TPzNNvfS KzK5KwSfYC7v0dQuPQ8pESv1vx1COHzyYAF79SB++eUMei1GyIhP8B9vbcoWH+JcWn7O V20+tNHFrgvkVWbDtqIyeuru2WiNIwHVnXRamGDW7uTqoogkyun70Hvp9nQ4DAUpbLRq JBWL317Ula4NzDiqs4ZnV+9ywSQcnNBFhke8hJuM56YN/N8G+ipVwEuQWdwNjEPAr6hX lkkQ== X-Gm-Message-State: APf1xPA2spmEzugICCk5eOlc0nU78gAsCxqRBi5+MPoZ1waMNsDws1FN Z760m1xfnvKPxwrFhAMwh24= X-Google-Smtp-Source: AH8x225gcA/CAJ9mx69u9IfG/iD9XdkuLcEJbnxvo8WEtjvieQOB2DGRmBeWfGOZmfOFBGJUuDLkHw== X-Received: by 10.55.88.7 with SMTP id m7mr6525518qkb.142.1518732387859; Thu, 15 Feb 2018 14:06:27 -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 10/11] sdcard: use G_BYTE from cutils Date: Thu, 15 Feb 2018 19:05:39 -0300 Message-Id: <20180215220540.6556-11-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 code is now easier to read. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis --- hw/sd/sd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 6760815045..28837768d4 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -36,6 +36,7 @@ #include "hw/sd/sd.h" #include "qapi/error.h" #include "qemu/bitmap.h" +#include "qemu/cutils.h" #include "hw/qdev-properties.h" #include "qemu/error-report.h" #include "qemu/timer.h" @@ -344,7 +345,7 @@ static void sd_set_csd(SDState *sd, uint64_t size) uint32_t sectsize =3D (1 << (SECTOR_SHIFT + 1)) - 1; uint32_t wpsize =3D (1 << (WPGROUP_SHIFT + 1)) - 1; =20 - if (size <=3D 0x40000000) { /* Standard Capacity SD */ + if (size <=3D 1 * G_BYTE) { /* Standard Capacity SD */ sd->csd[0] =3D 0x00; /* CSD structure */ sd->csd[1] =3D 0x26; /* Data read access-time-1 */ sd->csd[2] =3D 0x00; /* Data read access-time-2 */ --=20 2.16.1