| Message ID | 20240628070216.92609-35-philmd@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | hw/sd/sdcard: Add eMMC support | expand |
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 | 15 ++------------- > 1 file changed, 2 insertions(+), 13 deletions(-) > > diff --git a/hw/sd/sd.c b/hw/sd/sd.c > index bdd5f3486a..0cb528b0b2 100644 > --- a/hw/sd/sd.c > +++ b/hw/sd/sd.c > @@ -1628,17 +1628,7 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req) > > /* Lock card commands (Class 7) */ > case 42: /* CMD42: LOCK_UNLOCK */ > - 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, 0); > > /* Application specific commands (Class 8) */ > case 55: /* CMD55: APP_CMD */ > @@ -2109,8 +2099,7 @@ void sd_write_byte(SDState *sd, uint8_t value) > break; > > case 42: /* CMD42: LOCK_UNLOCK */ > - sd->data[sd->data_offset ++] = value; > - if (sd->data_offset >= sd->blk_len) { > + if (sd_generic_write_byte(sd, value)) { > /* TODO: Check CRC before committing */ > sd->state = sd_programming_state; > sd_lock_command(sd);
diff --git a/hw/sd/sd.c b/hw/sd/sd.c index bdd5f3486a..0cb528b0b2 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -1628,17 +1628,7 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req) /* Lock card commands (Class 7) */ case 42: /* CMD42: LOCK_UNLOCK */ - 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, 0); /* Application specific commands (Class 8) */ case 55: /* CMD55: APP_CMD */ @@ -2109,8 +2099,7 @@ void sd_write_byte(SDState *sd, uint8_t value) break; case 42: /* CMD42: LOCK_UNLOCK */ - sd->data[sd->data_offset ++] = value; - if (sd->data_offset >= sd->blk_len) { + if (sd_generic_write_byte(sd, value)) { /* TODO: Check CRC before committing */ sd->state = sd_programming_state; sd_lock_command(sd);
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- hw/sd/sd.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-)