[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC PATCH 03/17] hw/sd: Introduce sd_cmd_handler type
From: |
Cédric Le Goater |
Subject: |
[RFC PATCH 03/17] hw/sd: Introduce sd_cmd_handler type |
Date: |
Fri, 18 Mar 2022 14:28:10 +0100 |
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 45aa6a77de5e..a7c51913df82 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -88,8 +88,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 {
@@ -1012,6 +1016,10 @@ static sd_rsp_type_t sd_normal_command(SDState *sd,
SDRequest req)
return sd_illegal;
}
+ if (sd->proto->cmd[req.cmd]) {
+ return sd->proto->cmd[req.cmd](sd, req);
+ }
+
switch (req.cmd) {
/* Basic commands (Class 0 and Class 1) */
case 0: /* CMD0: GO_IDLE_STATE */
@@ -1556,6 +1564,11 @@ static sd_rsp_type_t sd_app_command(SDState *sd,
trace_sdcard_app_command(sd->proto->name, sd_acmd_name(req.cmd),
req.cmd, req.arg, sd_state_name(sd->state));
sd->card_status |= APP_CMD;
+
+ if (sd->proto->acmd[req.cmd]) {
+ return sd->proto->acmd[req.cmd](sd, req);
+ }
+
switch (req.cmd) {
case 6: /* ACMD6: SET_BUS_WIDTH */
if (sd->spi) {
--
2.34.1
- [RFC PATCH 12/17] hw/sd: Fix SET_BLOCK_COUNT command argument, (continued)
- [RFC PATCH 12/17] hw/sd: Fix SET_BLOCK_COUNT command argument, Cédric Le Goater, 2022/03/18
- [RFC PATCH 17/17] hw/sd: Subtract bootarea size from blk, Cédric Le Goater, 2022/03/18
- [RFC PATCH 06/17] hw/sd: Add sd_cmd_GO_IDLE_STATE() handler, Cédric Le Goater, 2022/03/18
- [RFC PATCH 04/17] hw/sd: Add sd_cmd_illegal() handler, Cédric Le Goater, 2022/03/18
- [RFC PATCH 14/17] hw/sd: Add CMD21 tuning sequence, Cédric Le Goater, 2022/03/18
- [RFC PATCH 05/17] hw/sd: Add sd_cmd_unimplemented() handler, Cédric Le Goater, 2022/03/18
- [RFC PATCH 13/17] hw/sd: Update CMD1 definition for MMC, Cédric Le Goater, 2022/03/18
- [RFC PATCH 11/17] hw/sd: Add eMMC support, Cédric Le Goater, 2022/03/18
- [RFC PATCH 07/17] hw/sd: Add sd_cmd_SEND_OP_CMD() handler, Cédric Le Goater, 2022/03/18
- [RFC PATCH 10/17] hw/sd: Add sd_cmd_SEND_TUNING_BLOCK() handler, Cédric Le Goater, 2022/03/18
- [RFC PATCH 03/17] hw/sd: Introduce sd_cmd_handler type,
Cédric Le Goater <=
- [RFC PATCH 16/17] hw/sd: Support boot area in emmc image, Cédric Le Goater, 2022/03/18
- [RFC PATCH 15/17] hw/sd: Add mmc switch function support, Cédric Le Goater, 2022/03/18
- [RFC PATCH 08/17] hw/sd: Add sd_cmd_ALL_SEND_CID() handler, Cédric Le Goater, 2022/03/18
- [RFC PATCH 09/17] hw/sd: Add sd_cmd_SEND_RELATIVE_ADDR() handler, Cédric Le Goater, 2022/03/18