diff mbox series

[PULL,15/32] sdcard: use G_BYTE from cutils

Message ID 20180222152307.7499-16-peter.maydell@linaro.org
State Accepted
Commit 7af83490fe02e6ca4d97ef736e24d65a5fb1b1c1
Headers show
Series target-arm queue | expand

Commit Message

Peter Maydell Feb. 22, 2018, 3:22 p.m. UTC 
From: Philippe Mathieu-Daudé <f4bug@amsat.org>


code is now easier to read.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

Reviewed-by: Alistair Francis <alistair.francis@xilinx.com>

Message-id: 20180215220540.6556-11-f4bug@amsat.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

---
 hw/sd/sd.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

-- 
2.16.1
diff mbox series

Patch

diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index 90d1e27ee7..b3698e34ad 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"
@@ -343,7 +344,7 @@  static void sd_set_csd(SDState *sd, uint64_t size)
     uint32_t sectsize = (1 << (SECTOR_SHIFT + 1)) - 1;
     uint32_t wpsize = (1 << (WPGROUP_SHIFT + 1)) - 1;
 
-    if (size <= 0x40000000) {	/* Standard Capacity SD */
+    if (size <= 1 * G_BYTE) { /* Standard Capacity SD */
         sd->csd[0] = 0x00;	/* CSD structure */
         sd->csd[1] = 0x26;	/* Data read access-time-1 */
         sd->csd[2] = 0x00;	/* Data read access-time-2 */