aboutsummaryrefslogtreecommitdiff
path: root/hw/sd
diff options
context:
space:
mode:
authorPhilippe Mathieu-Daudé <f4bug@amsat.org>2022-06-01 07:55:03 +0200
committerPhilippe Mathieu-Daudé <philmd@linaro.org>2024-07-02 10:08:32 +0200
commitdbccae20f76ddfcade41bb5a746ec88dc90b27f3 (patch)
treeb5497f2388bbb5c0d2e3be88800d196afc17f905 /hw/sd
parent540c1832dde061f15697112f49d766f9ba589794 (diff)
downloadqemu-dbccae20f76ddfcade41bb5a746ec88dc90b27f3.zip
qemu-dbccae20f76ddfcade41bb5a746ec88dc90b27f3.tar.gz
qemu-dbccae20f76ddfcade41bb5a746ec88dc90b27f3.tar.bz2
hw/sd/sdcard: Convert PROGRAM_CID to generic_write_byte (CMD26)
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> 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-33-philmd@linaro.org>
Diffstat (limited to 'hw/sd')
-rw-r--r--hw/sd/sd.c15
1 files changed, 2 insertions, 13 deletions
diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index 349549f..0aead3c 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -1507,17 +1507,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) {
@@ -2078,8 +2068,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 ++)