| Message ID | 20240621080554.18986-20-philmd@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | hw/sd/sdcard: Accumulation of cleanups and fixes | expand |
On 6/21/24 10:05 AM, Philippe Mathieu-Daudé wrote: > These macros only save 3 chars and make the code harder > to maintain, simply remove them. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> Reviewed-by: Cédric Le Goater <clg@redhat.com> Thanks, C. > --- > hw/sd/sd.c | 15 +++++++-------- > 1 file changed, 7 insertions(+), 8 deletions(-) > > diff --git a/hw/sd/sd.c b/hw/sd/sd.c > index 8d63a39a54..ca2c903c5b 100644 > --- a/hw/sd/sd.c > +++ b/hw/sd/sd.c > @@ -816,8 +816,6 @@ static void sd_blk_write(SDState *sd, uint64_t addr, uint32_t len) > } > } > > -#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) > > @@ -869,7 +867,7 @@ static void sd_erase(SDState *sd) > continue; > } > } > - BLK_WRITE_BLOCK(erase_addr, erase_len); > + sd_blk_write(sd, erase_addr, erase_len); > } > } > > @@ -1901,7 +1899,7 @@ void sd_write_byte(SDState *sd, uint8_t value) > if (sd->data_offset >= sd->blk_len) { > /* TODO: Check CRC before committing */ > sd->state = sd_programming_state; > - BLK_WRITE_BLOCK(sd->data_start, sd->data_offset); > + sd_blk_write(sd, sd->data_start, sd->data_offset); > sd->blk_written ++; > sd->csd[14] |= 0x40; > /* Bzzzzzzztt .... Operation complete. */ > @@ -1927,7 +1925,7 @@ void sd_write_byte(SDState *sd, uint8_t value) > if (sd->data_offset >= sd->blk_len) { > /* TODO: Check CRC before committing */ > sd->state = sd_programming_state; > - BLK_WRITE_BLOCK(sd->data_start, sd->data_offset); > + sd_blk_read(sd, sd->data_start, sd->data_offset); > sd->blk_written++; > sd->data_start += sd->blk_len; > sd->data_offset = 0; > @@ -2075,8 +2073,9 @@ uint8_t sd_read_byte(SDState *sd) > break; > > case 17: /* CMD17: READ_SINGLE_BLOCK */ > - if (sd->data_offset == 0) > - BLK_READ_BLOCK(sd->data_start, io_len); > + if (sd->data_offset == 0) { > + sd_blk_read(sd, sd->data_start, io_len); > + } > ret = sd->data[sd->data_offset ++]; > > if (sd->data_offset >= io_len) > @@ -2089,7 +2088,7 @@ uint8_t sd_read_byte(SDState *sd) > sd->data_start, io_len)) { > return 0x00; > } > - BLK_READ_BLOCK(sd->data_start, io_len); > + sd_blk_read(sd, sd->data_start, io_len); > } > ret = sd->data[sd->data_offset ++]; >
diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 8d63a39a54..ca2c903c5b 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -816,8 +816,6 @@ static void sd_blk_write(SDState *sd, uint64_t addr, uint32_t len) } } -#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) @@ -869,7 +867,7 @@ static void sd_erase(SDState *sd) continue; } } - BLK_WRITE_BLOCK(erase_addr, erase_len); + sd_blk_write(sd, erase_addr, erase_len); } } @@ -1901,7 +1899,7 @@ void sd_write_byte(SDState *sd, uint8_t value) if (sd->data_offset >= sd->blk_len) { /* TODO: Check CRC before committing */ sd->state = sd_programming_state; - BLK_WRITE_BLOCK(sd->data_start, sd->data_offset); + sd_blk_write(sd, sd->data_start, sd->data_offset); sd->blk_written ++; sd->csd[14] |= 0x40; /* Bzzzzzzztt .... Operation complete. */ @@ -1927,7 +1925,7 @@ void sd_write_byte(SDState *sd, uint8_t value) if (sd->data_offset >= sd->blk_len) { /* TODO: Check CRC before committing */ sd->state = sd_programming_state; - BLK_WRITE_BLOCK(sd->data_start, sd->data_offset); + sd_blk_read(sd, sd->data_start, sd->data_offset); sd->blk_written++; sd->data_start += sd->blk_len; sd->data_offset = 0; @@ -2075,8 +2073,9 @@ uint8_t sd_read_byte(SDState *sd) break; case 17: /* CMD17: READ_SINGLE_BLOCK */ - if (sd->data_offset == 0) - BLK_READ_BLOCK(sd->data_start, io_len); + if (sd->data_offset == 0) { + sd_blk_read(sd, sd->data_start, io_len); + } ret = sd->data[sd->data_offset ++]; if (sd->data_offset >= io_len) @@ -2089,7 +2088,7 @@ uint8_t sd_read_byte(SDState *sd) sd->data_start, io_len)) { return 0x00; } - BLK_READ_BLOCK(sd->data_start, io_len); + sd_blk_read(sd, sd->data_start, io_len); } ret = sd->data[sd->data_offset ++];
These macros only save 3 chars and make the code harder to maintain, simply remove them. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- hw/sd/sd.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)