From nobody Mon Feb 9 05:13:54 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 1529932891356472.4310746658201; Mon, 25 Jun 2018 06:21:31 -0700 (PDT) Received: from localhost ([::1]:46902 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fXRQw-0006gz-KU for importer@patchew.org; Mon, 25 Jun 2018 09:21:30 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54981) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fXQrX-0002RE-Ey for qemu-devel@nongnu.org; Mon, 25 Jun 2018 08:44:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fXQrW-0008F0-GQ for qemu-devel@nongnu.org; Mon, 25 Jun 2018 08:44:55 -0400 Received: from mail-qk0-x22a.google.com ([2607:f8b0:400d:c09::22a]:36331) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fXQrW-0008EQ-Ay; Mon, 25 Jun 2018 08:44:54 -0400 Received: by mail-qk0-x22a.google.com with SMTP id a132-v6so424480qkg.3; Mon, 25 Jun 2018 05:44:54 -0700 (PDT) Received: from x1.local ([138.117.48.222]) by smtp.gmail.com with ESMTPSA id m15-v6sm12549562qtm.84.2018.06.25.05.44.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 Jun 2018 05:44:53 -0700 (PDT) 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=qQqHj8f6hL24hFZB8G7iCb6VX3fY6vRHctkm2u7O/m4=; b=CXN0PQCkBCpMRcFtmJROYPXKZX3RpopiPZJaos3sXKPP04012tdfA1CaqUD91DSYVx 5UTMSalkDM82m/UFEeZRQVWD00ooscnJIObekgkqWE1e/nrlmqa97B3oHv8PmGP540iz 1B2tUdObGk5wqRkuSQZnbnBK7SrtQALYtaP+DHwVi2S1fm6RPp31tlMl5t2mT6/PbuRH iFAAsEvnz0pmcpaHM7zAM/n7uEzs570n8tPOeocukiUbtQwW/xfKxGjQQiHmHKsWXewq 935b6clUX9THeYRjZZvIJltQsB1vZCOxbacMlWXsxoutIEaw1omXjK1HYr/mE91ivqjf WPxQ== 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=qQqHj8f6hL24hFZB8G7iCb6VX3fY6vRHctkm2u7O/m4=; b=DTPWE+ARfdDzkzcqSGFbxQKZD+YiQUjHbT7pb93ye1nzwUdOTq5z+M3GUcvlrU4SYB N5V/ncfMZf0MLM4XcU/kzdOHgvyJtXIR4ig+GH+XGi+R6x4TtsUUpxRKfRwl9vScXUHQ 4Kmg81tk7IgDDUOnxrBC3gHKaqvlmSywfdcojx6/VIRX02hTtOVct9pyBGzfGRoXSGZD fYQ9ne8ftFOdoC7Ip4MeVB5dr2vDSE9MqLOITvztfxscCU6xDZBalT5epkF/cELNIIg2 GyN94BrUQlU0rDCnjYaur7t6O4WWbxT2pwd2T/lR2cgAeD4FpVeRRwrVAbJVMGsbmgRh qpiA== X-Gm-Message-State: APt69E3GN560LYbS/SkkHDP2poUxkiQCXROb7ARMzdgQVVCGAdu9lCjo qsLtdCosn2v7RyEnBNe6EQs= X-Google-Smtp-Source: AAOMgpfU6C4141qnMQmYhP9HTfuyg8p70I8yblleOCc2nP1sxcMYO4PTWz4JBoZOrqkJfocPNTFCTg== X-Received: by 2002:a37:5a47:: with SMTP id o68-v6mr10755619qkb.226.1529930693761; Mon, 25 Jun 2018 05:44:53 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Thomas Huth , Stefan Weil Date: Mon, 25 Jun 2018 09:42:28 -0300 Message-Id: <20180625124238.25339-37-f4bug@amsat.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180625124238.25339-1-f4bug@amsat.org> References: <20180625124238.25339-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:c09::22a Subject: [Qemu-devel] [PATCH v5 36/46] hw/sd: Use the IEC binary prefix definitions 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: qemu-trivial@nongnu.org, =?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 It eases code review, unit is explicit. Patch generated using: $ git grep -E '(1024|2048|4096|8192|(<<|>>).?(10|20|30))' hw/ include/hw/ and modified manually. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- hw/sd/sd.c | 4 ++-- hw/sd/sdhci.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 9a16b768ed..d4356e9b73 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -31,6 +31,7 @@ */ =20 #include "qemu/osdep.h" +#include "qemu/units.h" #include "hw/qdev.h" #include "hw/hw.h" #include "hw/registerfields.h" @@ -38,7 +39,6 @@ #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" @@ -403,7 +403,7 @@ static void sd_set_csd(SDState *sd, uint64_t size) ((HWBLOCK_SHIFT << 6) & 0xc0); sd->csd[14] =3D 0x00; /* File format group */ } else { /* SDHC */ - size /=3D 512 * 1024; + size /=3D 512 * KiB; size -=3D 1; sd->csd[0] =3D 0x40; sd->csd[1] =3D 0x0e; diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index a11e802485..643b39d306 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -23,6 +23,7 @@ */ =20 #include "qemu/osdep.h" +#include "qemu/units.h" #include "qemu/error-report.h" #include "qapi/error.h" #include "hw/hw.h" @@ -32,7 +33,6 @@ #include "hw/sd/sdhci.h" #include "sdhci-internal.h" #include "qemu/log.h" -#include "qemu/cutils.h" #include "trace.h" =20 #define TYPE_SDHCI_BUS "sdhci-bus" @@ -742,7 +742,7 @@ static void get_adma_description(SDHCIState *s, ADMADes= cr *dscr) if ((dscr->attr & SDHC_ADMA_ATTR_ACT_MASK) =3D=3D SDHC_ADMA_ATTR_S= ET_LEN) { dscr->length =3D (uint16_t)extract32(adma1, 12, 16); } else { - dscr->length =3D 4096; + dscr->length =3D 4 * KiB; } break; case SDHC_CTRL_ADMA2_64: @@ -790,7 +790,7 @@ static void sdhci_do_adma(SDHCIState *s) return; } =20 - length =3D dscr.length ? dscr.length : 65536; + length =3D dscr.length ? dscr.length : 64 * KiB; =20 switch (dscr.attr & SDHC_ADMA_ATTR_ACT_MASK) { case SDHC_ADMA_ATTR_ACT_TRAN: /* data transfer */ --=20 2.18.0