commit a182208e5db658dfa71506e3e0ff9a698d08a972
author Philippe Mathieu-Daudé <philmd@linaro.org> Wed Jun 12 23:23:54 2024 +0200
committer Philippe Mathieu-Daudé <philmd@linaro.org> Tue Jul 02 10:08:32 2024 +0200
tree c08994411799aea534722bc111bc463deacabc2b
parent dbccae20f76ddfcade41bb5a746ec88dc90b27f3

hw/sd/sdcard: Convert PROGRAM_CSD to generic_write_byte (CMD27)

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-34-philmd@linaro.org>

hw/sd/sd.c

diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index 0aead3c..95ba4d0 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -1510,17 +1510,7 @@
         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 */
@@ -2086,8 +2076,7 @@
         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 ++)