mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/sd/sdcard: Convert SWITCH_FUNCTION to generic_read_byte (CMD6)

Browse Source 
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-20-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2024-06-12 23:09:08 +02:00
parent f486bf7d10
commit 1544e9f41d
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hw/sd/sd.c
View File

@ -1081,7 +1081,6 @@ static sd_rsp_type_t sd_cmd_unimplemented(SDState *sd, SDRequest req)
} }
/* Configure fields for following sd_generic_read_byte() calls */ /* Configure fields for following sd_generic_read_byte() calls */
__attribute__((unused))
static sd_rsp_type_t sd_cmd_to_sendingdata(SDState *sd, SDRequest req, static sd_rsp_type_t sd_cmd_to_sendingdata(SDState *sd, SDRequest req,
uint64_t start, uint64_t start,
const void *data, size_t size) const void *data, size_t size)
@ -1235,10 +1234,7 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)
} }
sd_function_switch(sd, req.arg); sd_function_switch(sd, req.arg);
sd->state = sd_sendingdata_state; return sd_cmd_to_sendingdata(sd, req, 0, NULL, 64);
sd->data_start = 0;
sd->data_offset = 0;
return sd_r1;
case 7: /* CMD7: SELECT/DESELECT_CARD */ case 7: /* CMD7: SELECT/DESELECT_CARD */
rca = sd_req_get_rca(sd, req); rca = sd_req_get_rca(sd, req);
@ -1938,7 +1934,6 @@ send_response:
} }
/* Return true when buffer is consumed. Configured by sd_cmd_to_sendingdata() */ /* Return true when buffer is consumed. Configured by sd_cmd_to_sendingdata() */
__attribute__((unused))
static bool sd_generic_read_byte(SDState *sd, uint8_t *value) static bool sd_generic_read_byte(SDState *sd, uint8_t *value)
{ {
*value = sd->data[sd->data_offset]; *value = sd->data[sd->data_offset];
@ -2128,10 +2123,7 @@ uint8_t sd_read_byte(SDState *sd)
sd->current_cmd, sd->data_offset, io_len); sd->current_cmd, sd->data_offset, io_len);
switch (sd->current_cmd) { switch (sd->current_cmd) {
case 6: /* CMD6: SWITCH_FUNCTION */ case 6: /* CMD6: SWITCH_FUNCTION */
ret = sd->data[sd->data_offset ++]; sd_generic_read_byte(sd, &ret);
if (sd->data_offset >= 64)
sd->state = sd_transfer_state;
break; break;
case 9: /* CMD9: SEND_CSD */ case 9: /* CMD9: SEND_CSD */