From nobody Tue Feb 10 11:55:38 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 15166782112521022.3523271072435; Mon, 22 Jan 2018 19:30:11 -0800 (PST) Received: from localhost ([::1]:59062 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1edpHm-0001yk-Gi for importer@patchew.org; Mon, 22 Jan 2018 22:30:10 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35529) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1edpA9-0003pA-Oi for qemu-devel@nongnu.org; Mon, 22 Jan 2018 22:22:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1edpA8-0000zh-Rq for qemu-devel@nongnu.org; Mon, 22 Jan 2018 22:22:17 -0500 Received: from mail-qt0-x241.google.com ([2607:f8b0:400d:c0d::241]:44002) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1edpA8-0000zK-NS for qemu-devel@nongnu.org; Mon, 22 Jan 2018 22:22:16 -0500 Received: by mail-qt0-x241.google.com with SMTP id s3so26431097qtb.10 for ; Mon, 22 Jan 2018 19:22:16 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id x207sm5545567qka.91.2018.01.22.19.22.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Jan 2018 19:22:15 -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=sWX5tsJlJ9VR6KdVxL7IgptpwvyWK7sc7+9P3Ko30mg=; b=Jais3yMP4gcfh99QF849ykr5VPV7z/Xc8cCqmybSjaKpEV/ZNibcbcWGdl+RGnMXPH I/iFyqa8aoRNrYGaZTb7DFV523Vt/W5DHtph4de2/CP1DzfByyN5JBPZwJCFiTFST/yX Deow1BTX+s2FTYg4cyHKb+5NkMaSp4764bFYTOZJ4ch27E9rl498f94kX+HROkMjPREN uOdRzm1jH873oge4GOsw9Mhld6HX5kwRqrxN2R+qu098JmSJf5el0Y1hflhcdaZq59ut lLh9QIsG3BfXHZ6nX+uuG7VQCE0Y8ky2xJPGtdzsKWM+AnT95DcV39yBvJaosr08ZYy7 bEUg== 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=sWX5tsJlJ9VR6KdVxL7IgptpwvyWK7sc7+9P3Ko30mg=; b=BMQsEFkRiPQfWwS24LXFPoa/HiCiXYKCABJUmV8mVhkV7TYstZ6RtXO9FDEZx2ApHB eRxcgHHmKtRLvZF5WUSY/Iv6OqYXC9/7X8IDktkhgMvJSj4cyGbGsX39nkvisRd77bBt 3SNywDK/ostVmBE9i8Hpg3391TrmAssPKQttnVmErNExWrDH7XrQiXP+j3oHde8ZASY6 0OkJVcSITb5/crxjI9u5KYcKBhJ/C/DP4En2cFtAmxnwTlEYLNKG+jcL21qDIBVfb1Dn Fvxfc87FKeUfwcjbm1GFRMGejPldo5TWI0gTYR1VqRJM+W+LTwrK4r/MYg0NiqmJhAnU 3huQ== X-Gm-Message-State: AKwxytefd05zmmkw8bJemtq/qUzitfWLcnMJLx15kxEKSRwrowooYoiA HfDoPNkrjOb09ur6qNPPioE= X-Google-Smtp-Source: AH8x225eQBZQUhoEiC+iVyelwI9ntoW9yz5efXfSyg26lZWWR989WtEeEAyHWTuYUoVTtZDgIMJfGQ== X-Received: by 10.55.215.139 with SMTP id t11mr1468404qkt.355.1516677736312; Mon, 22 Jan 2018 19:22:16 -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:34 -0300 Message-Id: <20180123032135.28863-12-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 11/12] sdcard: use G_BYTE from cutils 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 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 8b5022a7db..f87e543f8f 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" @@ -342,7 +343,7 @@ static void sd_reset_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.15.1