On 6/28/24 9:01 AM, Philippe Mathieu-Daudé wrote:
> 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>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Thanks,
C.
> ---
> hw/sd/sd.c | 15 ++-------------
> 1 file changed, 2 insertions(+), 13 deletions(-)
>
> diff --git a/hw/sd/sd.c b/hw/sd/sd.c
> index 4a03f41086..b9c72a0128 100644
> --- a/hw/sd/sd.c
> +++ b/hw/sd/sd.c
> @@ -1515,17 +1515,7 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)
> break;
>
> case 26: /* CMD26: PROGRAM_CID */
> - switch (sd->state) {
> - case sd_transfer_state:
> - sd->state = sd_receivingdata_state;
> - sd->data_start = 0;
> - sd->data_offset = 0;
> - return sd_r1;
> -
> - default:
> - break;
> - }
> - break;
> + return sd_cmd_to_receivingdata(sd, req, 0, sizeof(sd->cid));
>
> case 27: /* CMD27: PROGRAM_CSD */
> switch (sd->state) {
> @@ -2088,8 +2078,7 @@ void sd_write_byte(SDState *sd, uint8_t value)
> break;
>
> case 26: /* CMD26: PROGRAM_CID */
> - sd->data[sd->data_offset ++] = value;
> - if (sd->data_offset >= sizeof(sd->cid)) {
> + if (sd_generic_write_byte(sd, value)) {
> /* TODO: Check CRC before committing */
> sd->state = sd_programming_state;
> for (i = 0; i < sizeof(sd->cid); i ++)