On 6/28/24 9:01 AM, Philippe Mathieu-Daudé wrote:
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Thanks,
C.
> ---
> hw/sd/sd.c | 16 ++++------------
> 1 file changed, 4 insertions(+), 12 deletions(-)
>
> diff --git a/hw/sd/sd.c b/hw/sd/sd.c
> index 1c4811f410..8d02cd9a26 100644
> --- a/hw/sd/sd.c
> +++ b/hw/sd/sd.c
> @@ -1715,11 +1715,9 @@ static sd_rsp_type_t sd_app_command(SDState *sd,
> case 22: /* ACMD22: SEND_NUM_WR_BLOCKS */
> switch (sd->state) {
> case sd_transfer_state:
> - stl_be_p(sd->data, sd->blk_written);
> - sd->state = sd_sendingdata_state;
> - sd->data_start = 0;
> - sd->data_offset = 0;
> - return sd_r1;
> + return sd_cmd_to_sendingdata(sd, req, 0,
> + &sd->blk_written,
> + sizeof(sd->blk_written));
>
> default:
> break;
> @@ -2138,6 +2136,7 @@ uint8_t sd_read_byte(SDState *sd)
> case 13: /* ACMD13: SD_STATUS */
> case 17: /* CMD17: READ_SINGLE_BLOCK */
> case 19: /* CMD19: SEND_TUNING_BLOCK (SD) */
> + case 22: /* ACMD22: SEND_NUM_WR_BLOCKS */
> case 30: /* CMD30: SEND_WRITE_PROT */
> case 56: /* CMD56: GEN_CMD */
> sd_generic_read_byte(sd, &ret);
> @@ -2167,13 +2166,6 @@ uint8_t sd_read_byte(SDState *sd)
> }
> 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 */
> ret = sd->scr[sd->data_offset ++];
>