[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 02/11] hw/sd/sdcard: Pass SDState as argument to sd_[a]cmd_name()
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 02/11] hw/sd/sdcard: Pass SDState as argument to sd_[a]cmd_name() |
Date: |
Thu, 27 Jun 2024 18:38:34 +0200 |
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(-)
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;
--
2.41.0
- [PATCH 00/11] hw/sd/sdcard: Consolidate SDProto::cmd[] arrays, Philippe Mathieu-Daudé, 2024/06/27
- [PATCH 01/11] hw/sd/sdcard: Move sd_[a]cmd_name() methods to sd.c, Philippe Mathieu-Daudé, 2024/06/27
- [PATCH 03/11] hw/sd/sdcard: Prepare SDProto to contain more fields, Philippe Mathieu-Daudé, 2024/06/27
- [PATCH 02/11] hw/sd/sdcard: Pass SDState as argument to sd_[a]cmd_name(),
Philippe Mathieu-Daudé <=
- [PATCH 04/11] hw/sd/sdcard: Store command name in SDProto, Philippe Mathieu-Daudé, 2024/06/27
- [PATCH 06/11] hw/sd/sdcard: Store command class in SDProto, Philippe Mathieu-Daudé, 2024/06/27
- [PATCH 05/11] hw/sd/sdcard: Store command type in SDProto, Philippe Mathieu-Daudé, 2024/06/27
- [PATCH 08/11] hw/sd/sdcard: Register generic optional handlers (CMD11 and CMD20), Philippe Mathieu-Daudé, 2024/06/27
- [PATCH 07/11] hw/sd/sdcard: Remove SEND_DSR dead case (CMD4), Philippe Mathieu-Daudé, 2024/06/27
- [PATCH 09/11] hw/sd/sdcard: Register optional handlers from spec v6.00, Philippe Mathieu-Daudé, 2024/06/27
- [PATCH 10/11] hw/sd/sdcard: Register SDIO optional handlers, Philippe Mathieu-Daudé, 2024/06/27
- [PATCH 11/11] hw/sd/sdcard: Register Security Extension optional handlers, Philippe Mathieu-Daudé, 2024/06/27