Proxmox-Port/qemu
1
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2025-08-16 06:43:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

hw/sd/sdcard: Pass SDState as argument to sd_[a]cmd_name()

Browse Source 
In order to access SDState::SDProto from sd_[a]cmd_name(),
pass SDState as argument.

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-38-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2024-06-20 14:56:03 +02:00
parent d4613f9f40
commit fb72e681c9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/sd/sd.c
View File

@ -230,7 +230,7 @@ static const char *sd_response_name(sd_rsp_type_t rsp)
return response_name[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] = { static const char *cmd_abbrev[SDMMC_CMD_MAX] = {
[0] = "GO_IDLE_STATE", [1] = "SEND_OP_COND", [0] = "GO_IDLE_STATE", [1] = "SEND_OP_COND",
@ -269,7 +269,7 @@ static const char *sd_cmd_name(uint8_t cmd)
return cmd_abbrev[cmd] ? cmd_abbrev[cmd] : "UNKNOWN_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] = { static const char *acmd_abbrev[SDMMC_CMD_MAX] = {
[6] = "SET_BUS_WIDTH", [6] = "SET_BUS_WIDTH",
@ -1273,7 +1273,7 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)
uint64_t addr; uint64_t addr;
uint32_t data; 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. /* 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. * However there is no ACMD55, so we want to trace this particular case.
*/ */
@ -1740,7 +1740,7 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)
static sd_rsp_type_t sd_app_command(SDState *sd, static sd_rsp_type_t sd_app_command(SDState *sd,
SDRequest req) 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, trace_sdcard_app_command(sd->proto->name, sd->last_cmd_name,
req.cmd, req.arg, sd_state_name(sd->state)); req.cmd, req.arg, sd_state_name(sd->state));
sd->card_status |= APP_CMD; sd->card_status |= APP_CMD;