[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 33/67] hw/sd/sdcard: Store command name in SDProto
From: |
Philippe Mathieu-Daudé |
Subject: |
[PULL 33/67] hw/sd/sdcard: Store command name in SDProto |
Date: |
Tue, 2 Jul 2024 11:20:16 +0200 |
We already have a const array where command handlers
are listed. Store the command name there too.
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-40-philmd@linaro.org>
---
hw/sd/sd.c | 35 ++++++++++++++++++++++-------------
1 file changed, 22 insertions(+), 13 deletions(-)
diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index fb82bc9aa3..2cfba6ff60 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -94,6 +94,7 @@ typedef sd_rsp_type_t (*sd_cmd_handler)(SDState *sd,
SDRequest req);
typedef struct SDProto {
const char *name;
struct {
+ const char *name;
sd_cmd_handler handler;
} cmd[SDMMC_CMD_MAX], acmd[SDMMC_CMD_MAX];
} SDProto;
@@ -234,8 +235,6 @@ static const char *sd_response_name(sd_rsp_type_t rsp)
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",
- [2] = "ALL_SEND_CID", [3] = "SEND_RELATIVE_ADDR",
[4] = "SET_DSR", [5] = "IO_SEND_OP_COND",
[6] = "SWITCH_FUNC", [7] = "SELECT/DESELECT_CARD",
[8] = "SEND_IF_COND", [9] = "SEND_CSD",
@@ -243,9 +242,8 @@ static const char *sd_cmd_name(SDState *sd, uint8_t cmd)
[12] = "STOP_TRANSMISSION", [13] = "SEND_STATUS",
[15] = "GO_INACTIVE_STATE",
[16] = "SET_BLOCKLEN", [17] = "READ_SINGLE_BLOCK",
- [18] = "READ_MULTIPLE_BLOCK", [19] = "SEND_TUNING_BLOCK",
+ [18] = "READ_MULTIPLE_BLOCK",
[20] = "SPEED_CLASS_CONTROL", [21] = "DPS_spec",
- [23] = "SET_BLOCK_COUNT",
[24] = "WRITE_BLOCK", [25] = "WRITE_MULTIPLE_BLOCK",
[26] = "MANUF_RSVD", [27] = "PROGRAM_CSD",
[28] = "SET_WRITE_PROT", [29] = "CLR_WRITE_PROT",
@@ -267,6 +265,12 @@ static const char *sd_cmd_name(SDState *sd, uint8_t cmd)
[60] = "MANUF_RSVD", [61] = "MANUF_RSVD",
[62] = "MANUF_RSVD", [63] = "MANUF_RSVD",
};
+ const SDProto *sdp = sd->proto;
+
+ if (sdp->cmd[cmd].handler) {
+ assert(!cmd_abbrev[cmd]);
+ return sdp->cmd[cmd].name;
+ }
return cmd_abbrev[cmd] ? cmd_abbrev[cmd] : "UNKNOWN_CMD";
}
@@ -279,7 +283,6 @@ static const char *sd_acmd_name(SDState *sd, uint8_t cmd)
[16] = "DPS_spec",
[18] = "SECU_spec",
[22] = "SEND_NUM_WR_BLOCKS", [23] = "SET_WR_BLK_ERASE_COUNT",
- [41] = "SD_SEND_OP_COND",
[42] = "SET_CLR_CARD_DETECT",
[51] = "SEND_SCR",
[52] = "SECU_spec", [53] = "SECU_spec",
@@ -287,6 +290,12 @@ static const char *sd_acmd_name(SDState *sd, uint8_t cmd)
[56] = "SECU_spec", [57] = "SECU_spec",
[58] = "SECU_spec", [59] = "SECU_spec",
};
+ const SDProto *sdp = sd->proto;
+
+ if (sdp->acmd[cmd].handler) {
+ assert(!acmd_abbrev[cmd]);
+ return sdp->acmd[cmd].name;
+ }
return acmd_abbrev[cmd] ? acmd_abbrev[cmd] : "UNKNOWN_ACMD";
}
@@ -2270,22 +2279,22 @@ void sd_enable(SDState *sd, bool enable)
static const SDProto sd_proto_spi = {
.name = "SPI",
.cmd = {
- [0] = {sd_cmd_GO_IDLE_STATE},
- [1] = {spi_cmd_SEND_OP_COND},
+ [0] = { "GO_IDLE_STATE", sd_cmd_GO_IDLE_STATE},
+ [1] = { "SEND_OP_COND", spi_cmd_SEND_OP_COND},
},
.acmd = {
- [41] = {spi_cmd_SEND_OP_COND},
+ [41] = { "SEND_OP_COND", spi_cmd_SEND_OP_COND},
},
};
static const SDProto sd_proto_sd = {
.name = "SD",
.cmd = {
- [0] = {sd_cmd_GO_IDLE_STATE},
- [2] = {sd_cmd_ALL_SEND_CID},
- [3] = {sd_cmd_SEND_RELATIVE_ADDR},
- [19] = {sd_cmd_SEND_TUNING_BLOCK},
- [23] = {sd_cmd_SET_BLOCK_COUNT},
+ [0] = { "GO_IDLE_STATE", sd_cmd_GO_IDLE_STATE},
+ [2] = { "ALL_SEND_CID", sd_cmd_ALL_SEND_CID},
+ [3] = { "SEND_RELATIVE_ADDR", sd_cmd_SEND_RELATIVE_ADDR},
+ [19] = { "SEND_TUNING_BLOCK", sd_cmd_SEND_TUNING_BLOCK},
+ [23] = { "SET_BLOCK_COUNT", sd_cmd_SET_BLOCK_COUNT},
},
};
--
2.41.0
- [PULL 23/67] hw/sd/sdcard: Convert SEND_SCR to generic_read_byte (ACMD51), (continued)
- [PULL 23/67] hw/sd/sdcard: Convert SEND_SCR to generic_read_byte (ACMD51), Philippe Mathieu-Daudé, 2024/07/02
- [PULL 24/67] hw/sd/sdcard: Introduce sd_cmd_to_receivingdata / sd_generic_write_byte, Philippe Mathieu-Daudé, 2024/07/02
- [PULL 25/67] hw/sd/sdcard: Duplicate WRITE_SINGLE_BLOCK / WRITE_MULTIPLE_BLOCK cases, Philippe Mathieu-Daudé, 2024/07/02
- [PULL 26/67] hw/sd/sdcard: Convert WRITE_SINGLE_BLOCK to generic_write_byte (CMD24), Philippe Mathieu-Daudé, 2024/07/02
- [PULL 27/67] hw/sd/sdcard: Convert PROGRAM_CID to generic_write_byte (CMD26), Philippe Mathieu-Daudé, 2024/07/02
- [PULL 28/67] hw/sd/sdcard: Convert PROGRAM_CSD to generic_write_byte (CMD27), Philippe Mathieu-Daudé, 2024/07/02
- [PULL 29/67] hw/sd/sdcard: Convert LOCK_UNLOCK to generic_write_byte (CMD42), Philippe Mathieu-Daudé, 2024/07/02
- [PULL 30/67] hw/sd/sdcard: Move sd_[a]cmd_name() methods to sd.c, Philippe Mathieu-Daudé, 2024/07/02
- [PULL 31/67] hw/sd/sdcard: Pass SDState as argument to sd_[a]cmd_name(), Philippe Mathieu-Daudé, 2024/07/02
- [PULL 32/67] hw/sd/sdcard: Prepare SDProto to contain more fields, Philippe Mathieu-Daudé, 2024/07/02
- [PULL 33/67] hw/sd/sdcard: Store command name in SDProto,
Philippe Mathieu-Daudé <=
- [PULL 34/67] hw/sd/sdcard: Store command type in SDProto, Philippe Mathieu-Daudé, 2024/07/02
- [PULL 36/67] hw/sd/sdcard: Remove SEND_DSR dead case (CMD4), Philippe Mathieu-Daudé, 2024/07/02
- [PULL 35/67] hw/sd/sdcard: Store command class in SDProto, Philippe Mathieu-Daudé, 2024/07/02
- [PULL 38/67] hw/sd/sdcard: Register optional handlers from spec v6.00, Philippe Mathieu-Daudé, 2024/07/02
- [PULL 41/67] hw/sd/sdcard: Add sd_cmd_SWITCH_FUNCTION handler (CMD6), Philippe Mathieu-Daudé, 2024/07/02
- [PULL 37/67] hw/sd/sdcard: Register generic optional handlers (CMD11 and CMD20), Philippe Mathieu-Daudé, 2024/07/02
- [PULL 40/67] hw/sd/sdcard: Register Security Extension optional handlers, Philippe Mathieu-Daudé, 2024/07/02
- [PULL 39/67] hw/sd/sdcard: Register SDIO optional handlers, Philippe Mathieu-Daudé, 2024/07/02
- [PULL 42/67] hw/sd/sdcard: Add sd_cmd_DE/SELECT_CARD handler (CMD7), Philippe Mathieu-Daudé, 2024/07/02
- [PULL 43/67] hw/sd/sdcard: Add sd_cmd_SEND_IF_COND handler (CMD8), Philippe Mathieu-Daudé, 2024/07/02