From: Philippe Mathieu-Daudé <philmd@linaro.org>
Date: Wed, 12 Jun 2024 21:32:18 +0000 (+0200)
Subject: hw/sd/sdcard: Convert LOCK_UNLOCK to generic_write_byte (CMD42)
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=77a2f97d1d1390d493a881983123bff5d04ead9a;p=qemu.git

hw/sd/sdcard: Convert LOCK_UNLOCK to generic_write_byte (CMD42)

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

diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index 95ba4d0755..822debb28b 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -1620,17 +1620,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 */
@@ -2099,8 +2089,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);