[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 05/25] hw/sd: Introduce sd_cmd_handler type
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v2 05/25] hw/sd: Introduce sd_cmd_handler type |
Date: |
Mon, 30 May 2022 21:37:56 +0200 |
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
Add 2 command handler arrays in SDProto, for CMD and ACMD.
Have sd_normal_command() / sd_app_command() use these arrays:
if an command handler is registered, call it, otherwise fall
back to current code base.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Message-Id: <20210624142209.1193073-5-f4bug@amsat.org>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
---
hw/sd/sd.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index 953dbbd7ae..ed63528615 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -87,8 +87,12 @@ enum SDCardStates {
sd_disconnect_state,
};
+typedef sd_rsp_type_t (*sd_cmd_handler)(SDState *sd, SDRequest req);
+
typedef struct SDProto {
const char *name;
+ sd_cmd_handler cmd[SDMMC_CMD_MAX];
+ sd_cmd_handler acmd[SDMMC_CMD_MAX];
} SDProto;
struct SDState {
@@ -1031,6 +1035,10 @@ static sd_rsp_type_t sd_normal_command(SDState *sd,
SDRequest req)
return sd_illegal;
}
+ if (sd_proto(sd)->cmd[req.cmd]) {
+ return sd_proto(sd)->cmd[req.cmd](sd, req);
+ }
+
switch (req.cmd) {
/* Basic commands (Class 0 and Class 1) */
case 0: /* CMD0: GO_IDLE_STATE */
@@ -1575,6 +1583,11 @@ static sd_rsp_type_t sd_app_command(SDState *sd,
trace_sdcard_app_command(sd_proto(sd)->name, sd_acmd_name(req.cmd),
req.cmd, req.arg, sd_state_name(sd->state));
sd->card_status |= APP_CMD;
+
+ if (sd_proto(sd)->acmd[req.cmd]) {
+ return sd_proto(sd)->acmd[req.cmd](sd, req);
+ }
+
switch (req.cmd) {
case 6: /* ACMD6: SET_BUS_WIDTH */
if (sd->spi) {
--
2.36.1
- [PATCH v2 00/25] hw/sd: Rework models for eMMC support, Philippe Mathieu-Daudé, 2022/05/30
- [PATCH v2 01/25] hw/sd/sdcard: Return ILLEGAL for CMD19/CMD23 prior SD spec v3.01, Philippe Mathieu-Daudé, 2022/05/30
- [PATCH v2 02/25] hw/sd: When card is in wrong state, log which state it is, Philippe Mathieu-Daudé, 2022/05/30
- [PATCH v2 03/25] hw/sd: When card is in wrong state, log which spec version is used, Philippe Mathieu-Daudé, 2022/05/30
- [PATCH v2 04/25] hw/sd: Move proto_name to SDProto structure, Philippe Mathieu-Daudé, 2022/05/30
- [PATCH v2 05/25] hw/sd: Introduce sd_cmd_handler type,
Philippe Mathieu-Daudé <=
- [PATCH v2 06/25] hw/sd: Add sd_cmd_illegal() handler, Philippe Mathieu-Daudé, 2022/05/30
- [PATCH v2 07/25] hw/sd: Add sd_cmd_unimplemented() handler, Philippe Mathieu-Daudé, 2022/05/30
- [PATCH v2 08/25] hw/sd: Add sd_cmd_GO_IDLE_STATE() handler, Philippe Mathieu-Daudé, 2022/05/30
- [PATCH v2 09/25] hw/sd: Add sd_cmd_SEND_OP_CMD() handler, Philippe Mathieu-Daudé, 2022/05/30
- [PATCH v2 10/25] hw/sd: Add sd_cmd_ALL_SEND_CID() handler, Philippe Mathieu-Daudé, 2022/05/30
- [PATCH v2 11/25] hw/sd: Add sd_cmd_SEND_RELATIVE_ADDR() handler, Philippe Mathieu-Daudé, 2022/05/30
- [PATCH v2 12/25] hw/sd: Add sd_cmd_SEND_TUNING_BLOCK() handler, Philippe Mathieu-Daudé, 2022/05/30
- [PATCH v2 13/25] hw/sd: Add sd_cmd_SET_BLOCK_COUNT() handler, Philippe Mathieu-Daudé, 2022/05/30
- [PATCH v2 14/25] hw/sd: Basis for eMMC support, Philippe Mathieu-Daudé, 2022/05/30