| Message ID | 20240628070216.92609-34-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 b9c72a0128..bdd5f3486a 100644 > --- a/hw/sd/sd.c > +++ b/hw/sd/sd.c > @@ -1518,17 +1518,7 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req) > return sd_cmd_to_receivingdata(sd, req, 0, sizeof(sd->cid)); > > case 27: /* CMD27: PROGRAM_CSD */ > - 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->csd)); > > /* Write protection (Class 6) */ > case 28: /* CMD28: SET_WRITE_PROT */ > @@ -2096,8 +2086,7 @@ void sd_write_byte(SDState *sd, uint8_t value) > break; > > case 27: /* CMD27: PROGRAM_CSD */ > - sd->data[sd->data_offset ++] = value; > - if (sd->data_offset >= sizeof(sd->csd)) { > + if (sd_generic_write_byte(sd, value)) { > /* TODO: Check CRC before committing */ > sd->state = sd_programming_state; > for (i = 0; i < sizeof(sd->csd); i ++)
diff --git a/hw/sd/sd.c b/hw/sd/sd.c index b9c72a0128..bdd5f3486a 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -1518,17 +1518,7 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req) return sd_cmd_to_receivingdata(sd, req, 0, sizeof(sd->cid)); case 27: /* CMD27: PROGRAM_CSD */ - 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->csd)); /* Write protection (Class 6) */ case 28: /* CMD28: SET_WRITE_PROT */ @@ -2096,8 +2086,7 @@ void sd_write_byte(SDState *sd, uint8_t value) break; case 27: /* CMD27: PROGRAM_CSD */ - sd->data[sd->data_offset ++] = value; - if (sd->data_offset >= sizeof(sd->csd)) { + if (sd_generic_write_byte(sd, value)) { /* TODO: Check CRC before committing */ sd->state = sd_programming_state; for (i = 0; i < sizeof(sd->csd); i ++)
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- hw/sd/sd.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-)