izzy/xemu
0
0
Fork 0
mirror of https://github.com/izzy2lost/xemu.git synced 2026-07-06 00:20:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

hw/sd/sdcard: Factor sd_response_size() out

Browse Source 
Set @rsplen once before switching to fill the response buffer.
This will allow to assert in a single place that the buffer is
big enough to be filled with the response.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20250804133406.17456-3-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé
2025-08-05 16:05:56 +02:00
parent 0a9a27305d
commit 3025ea65bd
1 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hw/sd/sd.c
+29 -7
View File
@@ -729,6 +729,33 @@ static int sd_req_crc_validate(SDRequest *req)
return sd_crc7(buffer, 5) != req->crc; /* TODO */
}
static size_t sd_response_size(SDState *sd, sd_rsp_type_t rtype)
{
switch (rtype) {
case sd_r1:
case sd_r1b:
return 4;
case sd_r2_i:
case sd_r2_s:
return 16;
case sd_r3:
case sd_r7:
return 4;
case sd_r6:
return 4;
case sd_r0:
case sd_illegal:
return 0;
default:
g_assert_not_reached();
}
}
static void sd_response_r1_make(SDState *sd, uint8_t *response)
{
stl_be_p(response, sd->card_status);
@@ -2203,36 +2230,32 @@ static int sd_do_command(SDState *sd, SDRequest *req,
}
send_response:
rsplen = sd_response_size(sd, rtype);
switch (rtype) {
case sd_r1:
case sd_r1b:
sd_response_r1_make(sd, response);
rsplen = 4;
break;
case sd_r2_i:
memcpy(response, sd->cid, sizeof(sd->cid));
rsplen = 16;
break;
case sd_r2_s:
memcpy(response, sd->csd, sizeof(sd->csd));
rsplen = 16;
break;
case sd_r3:
sd_response_r3_make(sd, response);
rsplen = 4;
break;
case sd_r6:
sd_response_r6_make(sd, response);
rsplen = 4;
break;
case sd_r7:
sd_response_r7_make(sd, response);
rsplen = 4;
break;
case sd_r0:
@@ -2244,7 +2267,6 @@ send_response:
sd->data_offset = 0;
/* fall-through */
case sd_illegal:
rsplen = 0;
break;
default:
g_assert_not_reached();