| Message ID | 20240621080554.18986-4-philmd@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | hw/sd/sdcard: Accumulation of cleanups and fixes | expand |
On 6/21/24 10:05 AM, Philippe Mathieu-Daudé wrote: > There is no SEND_OP_CMD but SEND_OP_COND. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> Reviewed-by: Cédric Le Goater <clg@redhat.com> Thanks, C. > --- > hw/sd/sd.c | 6 +++--- > hw/sd/sdmmc-internal.c | 2 +- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/hw/sd/sd.c b/hw/sd/sd.c > index addeb1940f..331cef5779 100644 > --- a/hw/sd/sd.c > +++ b/hw/sd/sd.c > @@ -1035,7 +1035,7 @@ static sd_rsp_type_t sd_cmd_GO_IDLE_STATE(SDState *sd, SDRequest req) > return sd_is_spi(sd) ? sd_r1 : sd_r0; > } > > -static sd_rsp_type_t sd_cmd_SEND_OP_CMD(SDState *sd, SDRequest req) > +static sd_rsp_type_t spi_cmd_SEND_OP_COND(SDState *sd, SDRequest req) > { > sd->state = sd_transfer_state; > > @@ -2149,7 +2149,7 @@ static const SDProto sd_proto_spi = { > .name = "SPI", > .cmd = { > [0] = sd_cmd_GO_IDLE_STATE, > - [1] = sd_cmd_SEND_OP_CMD, > + [1] = spi_cmd_SEND_OP_COND, > [2 ... 4] = sd_cmd_illegal, > [5] = sd_cmd_illegal, > [7] = sd_cmd_illegal, > @@ -2159,7 +2159,7 @@ static const SDProto sd_proto_spi = { > }, > .acmd = { > [6] = sd_cmd_unimplemented, > - [41] = sd_cmd_SEND_OP_CMD, > + [41] = spi_cmd_SEND_OP_COND, > }, > }; > > diff --git a/hw/sd/sdmmc-internal.c b/hw/sd/sdmmc-internal.c > index 8648a7808d..c1d5508ae6 100644 > --- a/hw/sd/sdmmc-internal.c > +++ b/hw/sd/sdmmc-internal.c > @@ -14,7 +14,7 @@ > const char *sd_cmd_name(uint8_t cmd) > { > static const char *cmd_abbrev[SDMMC_CMD_MAX] = { > - [0] = "GO_IDLE_STATE", [1] = "SEND_OP_CMD", > + [0] = "GO_IDLE_STATE", [1] = "SEND_OP_COND", > [2] = "ALL_SEND_CID", [3] = "SEND_RELATIVE_ADDR", > [4] = "SET_DSR", [5] = "IO_SEND_OP_COND", > [6] = "SWITCH_FUNC", [7] = "SELECT/DESELECT_CARD",
diff --git a/hw/sd/sd.c b/hw/sd/sd.c index addeb1940f..331cef5779 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -1035,7 +1035,7 @@ static sd_rsp_type_t sd_cmd_GO_IDLE_STATE(SDState *sd, SDRequest req) return sd_is_spi(sd) ? sd_r1 : sd_r0; } -static sd_rsp_type_t sd_cmd_SEND_OP_CMD(SDState *sd, SDRequest req) +static sd_rsp_type_t spi_cmd_SEND_OP_COND(SDState *sd, SDRequest req) { sd->state = sd_transfer_state; @@ -2149,7 +2149,7 @@ static const SDProto sd_proto_spi = { .name = "SPI", .cmd = { [0] = sd_cmd_GO_IDLE_STATE, - [1] = sd_cmd_SEND_OP_CMD, + [1] = spi_cmd_SEND_OP_COND, [2 ... 4] = sd_cmd_illegal, [5] = sd_cmd_illegal, [7] = sd_cmd_illegal, @@ -2159,7 +2159,7 @@ static const SDProto sd_proto_spi = { }, .acmd = { [6] = sd_cmd_unimplemented, - [41] = sd_cmd_SEND_OP_CMD, + [41] = spi_cmd_SEND_OP_COND, }, }; diff --git a/hw/sd/sdmmc-internal.c b/hw/sd/sdmmc-internal.c index 8648a7808d..c1d5508ae6 100644 --- a/hw/sd/sdmmc-internal.c +++ b/hw/sd/sdmmc-internal.c @@ -14,7 +14,7 @@ const char *sd_cmd_name(uint8_t cmd) { static const char *cmd_abbrev[SDMMC_CMD_MAX] = { - [0] = "GO_IDLE_STATE", [1] = "SEND_OP_CMD", + [0] = "GO_IDLE_STATE", [1] = "SEND_OP_COND", [2] = "ALL_SEND_CID", [3] = "SEND_RELATIVE_ADDR", [4] = "SET_DSR", [5] = "IO_SEND_OP_COND", [6] = "SWITCH_FUNC", [7] = "SELECT/DESELECT_CARD",
There is no SEND_OP_CMD but SEND_OP_COND. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- hw/sd/sd.c | 6 +++--- hw/sd/sdmmc-internal.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)