Commit 4c8f9735 authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé Committed by Paolo Bonzini
Browse files

hw/sd: Use the IEC binary prefix definitions 



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: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20180625124238.25339-37-f4bug@amsat.org>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 246e195b

hw/sd/sd.c

+2 −2
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
 */



#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] = 0x00;	/* File format group */

    } else {			/* SDHC */

        size /= 512 * 1024;

        size /= 512 * KiB;

        size -= 1;

        sd->csd[0] = 0x40;

        sd->csd[1] = 0x0e;

hw/sd/sdhci.c

+3 −3
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
 */



#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"



#define TYPE_SDHCI_BUS "sdhci-bus"
@@ -737,7 +737,7 @@ static void get_adma_description(SDHCIState *s, ADMADescr *dscr) 
        if ((dscr->attr & SDHC_ADMA_ATTR_ACT_MASK) == SDHC_ADMA_ATTR_SET_LEN) {

            dscr->length = (uint16_t)extract32(adma1, 12, 16);

        } else {

            dscr->length = 4096;

            dscr->length = 4 * KiB;

        }

        break;

    case SDHC_CTRL_ADMA2_64:
@@ -785,7 +785,7 @@ static void sdhci_do_adma(SDHCIState *s) 
            return;

        }



        length = dscr.length ? dscr.length : 65536;

        length = dscr.length ? dscr.length : 64 * KiB;



        switch (dscr.attr & SDHC_ADMA_ATTR_ACT_MASK) {

        case SDHC_ADMA_ATTR_ACT_TRAN:  /* data transfer */