motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-05 08:43:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

hw/sd/sdcard: Convert SEND_NUM_WR_BLOCKS to generic_read_byte (ACMD22)

Browse source 
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Tested-by: Cédric Le Goater <clg@redhat.com>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Message-Id: <20240628070216.92609-28-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2024-06-12 23:44:53 +02:00
parent ca24559d2c
commit 4d842275e2
1 changed files with 4 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

16
hw/sd/sd.c
View file

@ -1705,11 +1705,9 @@ static sd_rsp_type_t sd_app_command(SDState *sd,
case 22: /* ACMD22: SEND_NUM_WR_BLOCKS */ case 22: /* ACMD22: SEND_NUM_WR_BLOCKS */
switch (sd->state) { switch (sd->state) {
case sd_transfer_state: case sd_transfer_state:
stl_be_p(sd->data, sd->blk_written); return sd_cmd_to_sendingdata(sd, req, 0,
sd->state = sd_sendingdata_state; &sd->blk_written,
sd->data_start = 0; sizeof(sd->blk_written));
sd->data_offset = 0;
return sd_r1;
default: default:
break; break;
@ -2129,6 +2127,7 @@ uint8_t sd_read_byte(SDState *sd)
case 13: /* ACMD13: SD_STATUS */ case 13: /* ACMD13: SD_STATUS */
case 17: /* CMD17: READ_SINGLE_BLOCK */ case 17: /* CMD17: READ_SINGLE_BLOCK */
case 19: /* CMD19: SEND_TUNING_BLOCK (SD) */ case 19: /* CMD19: SEND_TUNING_BLOCK (SD) */
case 22: /* ACMD22: SEND_NUM_WR_BLOCKS */
case 30: /* CMD30: SEND_WRITE_PROT */ case 30: /* CMD30: SEND_WRITE_PROT */
sd_generic_read_byte(sd, &ret); sd_generic_read_byte(sd, &ret);
break; break;
@ -2157,13 +2156,6 @@ uint8_t sd_read_byte(SDState *sd)
} }
break; break;
case 22: /* ACMD22: SEND_NUM_WR_BLOCKS */
ret = sd->data[sd->data_offset ++];
if (sd->data_offset >= 4)
sd->state = sd_transfer_state;
break;
case 51: /* ACMD51: SEND_SCR */ case 51: /* ACMD51: SEND_SCR */
ret = sd->scr[sd->data_offset ++]; ret = sd->scr[sd->data_offset ++];