From: Philippe Mathieu-Daudé <f4bug@amsat.org>
Date: Sun, 25 Oct 2020 18:36:59 +0000 (+0100)
Subject: hw/sd/sdcard: Use HWBLOCK_SHIFT definition instead of magic values
X-Git-Tag: qemu-xen-4.20.0~101^2~13
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=f17fb69c55c7020b90cc1a9eaefe716902a5bc0e;p=qemu-xen.git

hw/sd/sdcard: Use HWBLOCK_SHIFT definition instead of magic values

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Tested-by: Cédric Le Goater <clg@redhat.com>
Message-Id: <20240621080554.18986-5-philmd@linaro.org>
---

diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index 72d71259d3..a14c5ff147 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -596,7 +596,7 @@ static void sd_reset(DeviceState *dev)
     } else {
         sect = 0;
     }
-    size = sect << 9;
+    size = sect << HWBLOCK_SHIFT;
 
     sect = sd_addr_to_wpnum(size) + 1;
 
@@ -822,8 +822,8 @@ static void sd_erase(SDState *sd)
 
     if (FIELD_EX32(sd->ocr, OCR, CARD_CAPACITY)) {
         /* High capacity memory card: erase units are 512 byte blocks */
-        erase_start *= 512;
-        erase_end *= 512;
+        erase_start <<= HWBLOCK_SHIFT;
+        erase_end <<= HWBLOCK_SHIFT;
         sdsc = false;
     }