[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 4/8] hw/sd: sd: Move the sd_block_{read, write} and macros ahe
From: |
Bin Meng |
Subject: |
[PATCH v2 4/8] hw/sd: sd: Move the sd_block_{read, write} and macros ahead |
Date: |
Tue, 16 Feb 2021 23:02:21 +0800 |
From: Bin Meng <bin.meng@windriver.com>
These APIs and macros may be referenced by functions that are
currently before them. Move them ahead a little bit.
Signed-off-by: Bin Meng <bin.meng@windriver.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
(no changes since v1)
hw/sd/sd.c | 42 +++++++++++++++++++++---------------------
1 file changed, 21 insertions(+), 21 deletions(-)
diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index 6af821b75b..5bd95304f1 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -739,6 +739,27 @@ void sd_set_cb(SDState *sd, qemu_irq readonly, qemu_irq
insert)
qemu_set_irq(insert, sd->blk ? blk_is_inserted(sd->blk) : 0);
}
+static void sd_blk_read(SDState *sd, uint64_t addr, uint32_t len)
+{
+ trace_sdcard_read_block(addr, len);
+ if (!sd->blk || blk_pread(sd->blk, addr, sd->data, len) < 0) {
+ fprintf(stderr, "sd_blk_read: read error on host side\n");
+ }
+}
+
+static void sd_blk_write(SDState *sd, uint64_t addr, uint32_t len)
+{
+ trace_sdcard_write_block(addr, len);
+ if (!sd->blk || blk_pwrite(sd->blk, addr, sd->data, len, 0) < 0) {
+ fprintf(stderr, "sd_blk_write: write error on host side\n");
+ }
+}
+
+#define BLK_READ_BLOCK(a, len) sd_blk_read(sd, a, len)
+#define BLK_WRITE_BLOCK(a, len) sd_blk_write(sd, a, len)
+#define APP_READ_BLOCK(a, len) memset(sd->data, 0xec, len)
+#define APP_WRITE_BLOCK(a, len)
+
static void sd_erase(SDState *sd)
{
int i;
@@ -1754,27 +1775,6 @@ send_response:
return rsplen;
}
-static void sd_blk_read(SDState *sd, uint64_t addr, uint32_t len)
-{
- trace_sdcard_read_block(addr, len);
- if (!sd->blk || blk_pread(sd->blk, addr, sd->data, len) < 0) {
- fprintf(stderr, "sd_blk_read: read error on host side\n");
- }
-}
-
-static void sd_blk_write(SDState *sd, uint64_t addr, uint32_t len)
-{
- trace_sdcard_write_block(addr, len);
- if (!sd->blk || blk_pwrite(sd->blk, addr, sd->data, len, 0) < 0) {
- fprintf(stderr, "sd_blk_write: write error on host side\n");
- }
-}
-
-#define BLK_READ_BLOCK(a, len) sd_blk_read(sd, a, len)
-#define BLK_WRITE_BLOCK(a, len) sd_blk_write(sd, a, len)
-#define APP_READ_BLOCK(a, len) memset(sd->data, 0xec, len)
-#define APP_WRITE_BLOCK(a, len)
-
void sd_write_byte(SDState *sd, uint8_t value)
{
int i;
--
2.25.1
- [PATCH v2 0/8] hw/sd: sd: Erase operation and other fixes, Bin Meng, 2021/02/16
- [PATCH v2 1/8] hw/sd: sd: Fix address check in sd_erase(), Bin Meng, 2021/02/16
- [PATCH v2 2/8] hw/sd: sd: Only SDSC cards support CMD28/29/30, Bin Meng, 2021/02/16
- [PATCH v2 3/8] hw/sd: sd: Fix CMD30 response type, Bin Meng, 2021/02/16
- [PATCH v2 5/8] hw/sd: sd: Skip write protect groups check in sd_erase() for high capacity cards, Bin Meng, 2021/02/16
- [PATCH v2 4/8] hw/sd: sd: Move the sd_block_{read, write} and macros ahead,
Bin Meng <=
- [PATCH v2 6/8] hw/sd: sd: Actually perform the erase operation, Bin Meng, 2021/02/16
- [PATCH v2 8/8] hw/sd: sd: Bypass the RCA check for CMD13 in SPI mode, Bin Meng, 2021/02/16
- [PATCH v2 7/8] hw/sd: sd: Skip write protect groups check in CMD24/25 for high capacity cards, Bin Meng, 2021/02/16
- Re: [PATCH v2 0/8] hw/sd: sd: Erase operation and other fixes, Philippe Mathieu-Daudé, 2021/02/19