ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/sd/sdcard: Convert SEND_TUNING_BLOCK to generic_read_byte (CMD19) 

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-24-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2022-06-01 07:15:10 +02:00 committed by Philippe Mathieu-Daudé
parent e7a73713f8
commit 060f0dac86
1 changed files with 19 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
hw/sd/sd.c
View File

@ -564,6 +564,21 @@ static void sd_set_sdstatus(SDState *sd)
memset(sd->sd_status, 0, 64); memset(sd->sd_status, 0, 64);
} }
static const uint8_t sd_tuning_block_pattern4[64] = {
/*
* See: Physical Layer Simplified Specification Version 3.01,
* Table 4-2.
*/
0xff, 0x0f, 0xff, 0x00, 0x0f, 0xfc, 0xc3, 0xcc,
0xc3, 0x3c, 0xcc, 0xff, 0xfe, 0xff, 0xfe, 0xef,
0xff, 0xdf, 0xff, 0xdd, 0xff, 0xfb, 0xff, 0xfb,
0xbf, 0xff, 0x7f, 0xff, 0x77, 0xf7, 0xbd, 0xef,
0xff, 0xf0, 0xff, 0xf0, 0x0f, 0xfc, 0xcc, 0x3c,
0xcc, 0x33, 0xcc, 0xcf, 0xff, 0xef, 0xff, 0xee,
0xff, 0xfd, 0xff, 0xfd, 0xdf, 0xff, 0xbf, 0xff,
0xbb, 0xff, 0xf7, 0xff, 0xf7, 0x7f, 0x7b, 0xde
};
static int sd_req_crc_validate(SDRequest *req) static int sd_req_crc_validate(SDRequest *req)
{ {
uint8_t buffer[5]; uint8_t buffer[5];
@ -1153,14 +1168,9 @@ static sd_rsp_type_t sd_cmd_SEND_TUNING_BLOCK(SDState *sd, SDRequest req)
return sd_cmd_illegal(sd, req); return sd_cmd_illegal(sd, req);
} }
if (sd->state != sd_transfer_state) { return sd_cmd_to_sendingdata(sd, req, 0,
return sd_invalid_state_for_cmd(sd, req); sd_tuning_block_pattern4,
} sizeof(sd_tuning_block_pattern4));
sd->state = sd_sendingdata_state;
sd->data_offset = 0;
return sd_r1;
} }
/* CMD23 */ /* CMD23 */
@ -2093,20 +2103,6 @@ void sd_write_byte(SDState *sd, uint8_t value)
} }
} }
#define SD_TUNING_BLOCK_SIZE 64
static const uint8_t sd_tuning_block_pattern[SD_TUNING_BLOCK_SIZE] = {
/* See: Physical Layer Simplified Specification Version 3.01, Table 4-2 */
0xff, 0x0f, 0xff, 0x00, 0x0f, 0xfc, 0xc3, 0xcc,
0xc3, 0x3c, 0xcc, 0xff, 0xfe, 0xff, 0xfe, 0xef,
0xff, 0xdf, 0xff, 0xdd, 0xff, 0xfb, 0xff, 0xfb,
0xbf, 0xff, 0x7f, 0xff, 0x77, 0xf7, 0xbd, 0xef,
0xff, 0xf0, 0xff, 0xf0, 0x0f, 0xfc, 0xcc, 0x3c,
0xcc, 0x33, 0xcc, 0xcf, 0xff, 0xef, 0xff, 0xee,
0xff, 0xfd, 0xff, 0xfd, 0xdf, 0xff, 0xbf, 0xff,
0xbb, 0xff, 0xf7, 0xff, 0xf7, 0x7f, 0x7b, 0xde,
};
uint8_t sd_read_byte(SDState *sd) uint8_t sd_read_byte(SDState *sd)
{ {
/* TODO: Append CRCs */ /* TODO: Append CRCs */
@ -2135,6 +2131,7 @@ uint8_t sd_read_byte(SDState *sd)
case 9: /* CMD9: SEND_CSD */ case 9: /* CMD9: SEND_CSD */
case 10: /* CMD10: SEND_CID */ case 10: /* CMD10: SEND_CID */
case 17: /* CMD17: READ_SINGLE_BLOCK */ case 17: /* CMD17: READ_SINGLE_BLOCK */
case 19: /* CMD19: SEND_TUNING_BLOCK (SD) */
sd_generic_read_byte(sd, &ret); sd_generic_read_byte(sd, &ret);
break; break;
@ -2169,13 +2166,6 @@ uint8_t sd_read_byte(SDState *sd)
} }
break; break;
case 19: /* CMD19: SEND_TUNING_BLOCK (SD) */
if (sd->data_offset >= SD_TUNING_BLOCK_SIZE - 1) {
sd->state = sd_transfer_state;
}
ret = sd_tuning_block_pattern[sd->data_offset++];
break;
case 22: /* ACMD22: SEND_NUM_WR_BLOCKS */ case 22: /* ACMD22: SEND_NUM_WR_BLOCKS */
ret = sd->data[sd->data_offset ++]; ret = sd->data[sd->data_offset ++];