| Message ID | 20240628070216.92609-38-philmd@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | hw/sd/sdcard: Add eMMC support | expand |
On 6/28/24 9:01 AM, Philippe Mathieu-Daudé wrote: > In order to access SDState::SDProto from sd_[a]cmd_name(), > pass SDState as argument. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> Reviewed-by: Cédric Le Goater <clg@redhat.com> Thanks, C. > --- > hw/sd/sd.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/hw/sd/sd.c b/hw/sd/sd.c > index 93a4a4e1b4..f4bdd12b26 100644 > --- a/hw/sd/sd.c > +++ b/hw/sd/sd.c > @@ -233,7 +233,7 @@ static const char *sd_response_name(sd_rsp_type_t rsp) > return response_name[rsp]; > } > > -static const char *sd_cmd_name(uint8_t cmd) > +static const char *sd_cmd_name(SDState *sd, uint8_t cmd) > { > static const char *cmd_abbrev[SDMMC_CMD_MAX] = { > [0] = "GO_IDLE_STATE", [1] = "SEND_OP_COND", > @@ -272,7 +272,7 @@ static const char *sd_cmd_name(uint8_t cmd) > return cmd_abbrev[cmd] ? cmd_abbrev[cmd] : "UNKNOWN_CMD"; > } > > -static const char *sd_acmd_name(uint8_t cmd) > +static const char *sd_acmd_name(SDState *sd, uint8_t cmd) > { > static const char *acmd_abbrev[SDMMC_CMD_MAX] = { > [6] = "SET_BUS_WIDTH", > @@ -1281,7 +1281,7 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req) > uint64_t addr; > uint32_t data; > > - sd->last_cmd_name = sd_cmd_name(req.cmd); > + sd->last_cmd_name = sd_cmd_name(sd, req.cmd); > /* CMD55 precedes an ACMD, so we are not interested in tracing it. > * However there is no ACMD55, so we want to trace this particular case. > */ > @@ -1748,7 +1748,7 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req) > static sd_rsp_type_t sd_app_command(SDState *sd, > SDRequest req) > { > - sd->last_cmd_name = sd_acmd_name(req.cmd); > + sd->last_cmd_name = sd_acmd_name(sd, req.cmd); > trace_sdcard_app_command(sd->proto->name, sd->last_cmd_name, > req.cmd, req.arg, sd_state_name(sd->state)); > sd->card_status |= APP_CMD;
diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 93a4a4e1b4..f4bdd12b26 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -233,7 +233,7 @@ static const char *sd_response_name(sd_rsp_type_t rsp) return response_name[rsp]; } -static const char *sd_cmd_name(uint8_t cmd) +static const char *sd_cmd_name(SDState *sd, uint8_t cmd) { static const char *cmd_abbrev[SDMMC_CMD_MAX] = { [0] = "GO_IDLE_STATE", [1] = "SEND_OP_COND", @@ -272,7 +272,7 @@ static const char *sd_cmd_name(uint8_t cmd) return cmd_abbrev[cmd] ? cmd_abbrev[cmd] : "UNKNOWN_CMD"; } -static const char *sd_acmd_name(uint8_t cmd) +static const char *sd_acmd_name(SDState *sd, uint8_t cmd) { static const char *acmd_abbrev[SDMMC_CMD_MAX] = { [6] = "SET_BUS_WIDTH", @@ -1281,7 +1281,7 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req) uint64_t addr; uint32_t data; - sd->last_cmd_name = sd_cmd_name(req.cmd); + sd->last_cmd_name = sd_cmd_name(sd, req.cmd); /* CMD55 precedes an ACMD, so we are not interested in tracing it. * However there is no ACMD55, so we want to trace this particular case. */ @@ -1748,7 +1748,7 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req) static sd_rsp_type_t sd_app_command(SDState *sd, SDRequest req) { - sd->last_cmd_name = sd_acmd_name(req.cmd); + sd->last_cmd_name = sd_acmd_name(sd, req.cmd); trace_sdcard_app_command(sd->proto->name, sd->last_cmd_name, req.cmd, req.arg, sd_state_name(sd->state)); sd->card_status |= APP_CMD;
In order to access SDState::SDProto from sd_[a]cmd_name(), pass SDState as argument. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- hw/sd/sd.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)