mirrors/qemu
0
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2024-12-03 16:53:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

hw/sd: Add sd_cmd_SEND_OP_CMD() handler

Browse Source 
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
[ clg: Update cmd_abbrev ]
Message-Id: <20210624142209.1193073-9-f4bug@amsat.org>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
This commit is contained in:
Philippe Mathieu-Daudé 2021-06-24 15:29:27 +02:00 committed by Cédric Le Goater
parent a6e0f67e77
commit 5c44e82009
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hw/sd/sd.c
View File

@ -1030,6 +1030,13 @@ static sd_rsp_type_t sd_cmd_GO_IDLE_STATE(SDState *sd, SDRequest req)
return sd->spi ? sd_r1 : sd_r0; return sd->spi ? sd_r1 : sd_r0;
} }
static sd_rsp_type_t sd_cmd_SEND_OP_CMD(SDState *sd, SDRequest req)
{
sd->state = sd_transfer_state;
return sd_r1;
}
static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req) static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)
{ {
uint32_t rca = 0x0000; uint32_t rca = 0x0000;
@ -1069,10 +1076,6 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)
switch (req.cmd) { switch (req.cmd) {
/* Basic commands (Class 0 and Class 1) */ /* Basic commands (Class 0 and Class 1) */
case 1: /* CMD1: SEND_OP_CMD */
sd->state = sd_transfer_state;
return sd_r1;
case 2: /* CMD2: ALL_SEND_CID */ case 2: /* CMD2: ALL_SEND_CID */
switch (sd->state) { switch (sd->state) {
case sd_ready_state: case sd_ready_state:
@ -1622,11 +1625,6 @@ static sd_rsp_type_t sd_app_command(SDState *sd,
break; break;
case 41: /* ACMD41: SD_APP_OP_COND */ case 41: /* ACMD41: SD_APP_OP_COND */
if (sd->spi) {
/* SEND_OP_CMD */
sd->state = sd_transfer_state;
return sd_r1;
}
if (sd->state != sd_idle_state) { if (sd->state != sd_idle_state) {
break; break;
} }
@ -2131,6 +2129,7 @@ static const SDProto sd_proto_spi = {
.name = "SPI", .name = "SPI",
.cmd = { .cmd = {
[0] = sd_cmd_GO_IDLE_STATE, [0] = sd_cmd_GO_IDLE_STATE,
[1] = sd_cmd_SEND_OP_CMD,
[2 ... 4] = sd_cmd_illegal, [2 ... 4] = sd_cmd_illegal,
[5] = sd_cmd_illegal, [5] = sd_cmd_illegal,
[7] = sd_cmd_illegal, [7] = sd_cmd_illegal,
@ -2140,6 +2139,7 @@ static const SDProto sd_proto_spi = {
}, },
.acmd = { .acmd = {
[6] = sd_cmd_unimplemented, [6] = sd_cmd_unimplemented,
[41] = sd_cmd_SEND_OP_CMD,
}, },
}; };

2
hw/sd/sdmmc-internal.c
View File

@ -14,7 +14,7 @@
const char *sd_cmd_name(uint8_t cmd) const char *sd_cmd_name(uint8_t cmd)
{ {
static const char *cmd_abbrev[SDMMC_CMD_MAX] = { static const char *cmd_abbrev[SDMMC_CMD_MAX] = {
[0] = "GO_IDLE_STATE", [0] = "GO_IDLE_STATE", [1] = "SEND_OP_CMD",
[2] = "ALL_SEND_CID", [3] = "SEND_RELATIVE_ADDR", [2] = "ALL_SEND_CID", [3] = "SEND_RELATIVE_ADDR",
[4] = "SET_DSR", [5] = "IO_SEND_OP_COND", [4] = "SET_DSR", [5] = "IO_SEND_OP_COND",
[6] = "SWITCH_FUNC", [7] = "SELECT/DESELECT_CARD", [6] = "SWITCH_FUNC", [7] = "SELECT/DESELECT_CARD",