[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 04/23] hw/sd/sdcard: Use HWBLOCK_SHIFT definition instead of magi
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 04/23] hw/sd/sdcard: Use HWBLOCK_SHIFT definition instead of magic values |
Date: |
Fri, 21 Jun 2024 10:05:35 +0200 |
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
hw/sd/sd.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index 331cef5779..c528c30bcf 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;
}
--
2.41.0
- [PATCH 00/23] hw/sd/sdcard: Accumulation of cleanups and fixes, Philippe Mathieu-Daudé, 2024/06/21
- [PATCH 01/23] hw/sd/sdcard: Correct code indentation, Philippe Mathieu-Daudé, 2024/06/21
- [PATCH 02/23] hw/sd/sdcard: Rewrite sd_cmd_ALL_SEND_CID using switch case (CMD2), Philippe Mathieu-Daudé, 2024/06/21
- [PATCH 03/23] hw/sd/sdcard: Fix typo in SEND_OP_COND command name, Philippe Mathieu-Daudé, 2024/06/21
- [PATCH 04/23] hw/sd/sdcard: Use HWBLOCK_SHIFT definition instead of magic values,
Philippe Mathieu-Daudé <=
- [PATCH 05/23] hw/sd/sdcard: Use registerfield CSR::CURRENT_STATE definition, Philippe Mathieu-Daudé, 2024/06/21
- [PATCH 06/23] hw/sd/sdcard: Use Load/Store API to fill some CID/CSD registers, Philippe Mathieu-Daudé, 2024/06/21
- [PATCH 07/23] hw/sd/sdcard: Remove ACMD6 handler for SPI mode, Philippe Mathieu-Daudé, 2024/06/21
- [PATCH 08/23] hw/sd/sdcard: Remove explicit entries for illegal commands, Philippe Mathieu-Daudé, 2024/06/21
- [PATCH 09/23] hw/sd/sdcard: Generate random RCA value, Philippe Mathieu-Daudé, 2024/06/21