[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 02/12] hw/sd/sdcard: Add sd_acmd_SD_STATUS handler (ACMD13)
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 02/12] hw/sd/sdcard: Add sd_acmd_SD_STATUS handler (ACMD13) |
Date: |
Fri, 28 Jun 2024 06:53:13 +0200 |
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
hw/sd/sd.c | 22 +++++++++-------------
1 file changed, 9 insertions(+), 13 deletions(-)
diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index 0310a5a3a1..5323a42df2 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -260,7 +260,6 @@ static const char *sd_cmd_name(SDState *sd, uint8_t cmd)
static const char *sd_acmd_name(SDState *sd, uint8_t cmd)
{
static const char *acmd_abbrev[SDMMC_CMD_MAX] = {
- [13] = "SD_STATUS",
[14] = "DPS_spec", [15] = "DPS_spec",
[16] = "DPS_spec",
[18] = "SECU_spec",
@@ -1683,6 +1682,13 @@ static sd_rsp_type_t sd_acmd_SET_BUS_WIDTH(SDState *sd,
SDRequest req)
return sd_r1;
}
+/* ACMD13 */
+static sd_rsp_type_t sd_acmd_SD_STATUS(SDState *sd, SDRequest req)
+{
+ return sd_cmd_to_sendingdata(sd, req, 0,
+ sd->sd_status, sizeof(sd->sd_status));
+}
+
static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)
{
uint64_t addr;
@@ -1791,18 +1797,6 @@ static sd_rsp_type_t sd_app_command(SDState *sd,
}
switch (req.cmd) {
- case 13: /* ACMD13: SD_STATUS */
- switch (sd->state) {
- case sd_transfer_state:
- return sd_cmd_to_sendingdata(sd, req, 0,
- sd->sd_status,
- sizeof(sd->sd_status));
-
- default:
- break;
- }
- break;
-
case 22: /* ACMD22: SEND_NUM_WR_BLOCKS */
switch (sd->state) {
case sd_transfer_state:
@@ -2329,6 +2323,7 @@ static const SDProto sd_proto_spi = {
[59] = {0, sd_spi, "CRC_ON_OFF", spi_cmd_CRC_ON_OFF},
},
.acmd = {
+ [13] = {8, sd_spi, "SD_STATUS", sd_acmd_SD_STATUS},
[41] = {8, sd_spi, "SEND_OP_COND", spi_cmd_SEND_OP_COND},
},
};
@@ -2386,6 +2381,7 @@ static const SDProto sd_proto_sd = {
},
.acmd = {
[6] = {8, sd_ac, "SET_BUS_WIDTH", sd_acmd_SET_BUS_WIDTH},
+ [13] = {8, sd_adtc, "SD_STATUS", sd_acmd_SD_STATUS},
},
};
--
2.41.0
- [PATCH 00/12] hw/sd/sdcard: Convert ACMD to sd_cmd_handler format, Philippe Mathieu-Daudé, 2024/06/27
- [PATCH 01/12] hw/sd/sdcard: Add sd_acmd_SET_BUS_WIDTH handler (ACMD6), Philippe Mathieu-Daudé, 2024/06/27
- [PATCH 02/12] hw/sd/sdcard: Add sd_acmd_SD_STATUS handler (ACMD13),
Philippe Mathieu-Daudé <=
- [PATCH 03/12] hw/sd/sdcard: Add sd_acmd_SEND_NUM_WR_BLOCKS handler (ACMD22), Philippe Mathieu-Daudé, 2024/06/28
- [PATCH 04/12] hw/sd/sdcard: Add sd_acmd_SET_WR_BLK_ERASE_COUNT handler (ACMD23), Philippe Mathieu-Daudé, 2024/06/28
- [PATCH 05/12] hw/sd/sdcard: Add sd_acmd_SD_APP_OP_COND handler (ACMD41), Philippe Mathieu-Daudé, 2024/06/28
- [PATCH 06/12] hw/sd/sdcard: Add sd_acmd_SET_CLR_CARD_DETECT handler (ACMD42), Philippe Mathieu-Daudé, 2024/06/28
- [PATCH 07/12] hw/sd/sdcard: Add sd_acmd_SEND_SCR handler (ACMD51), Philippe Mathieu-Daudé, 2024/06/28
- [PATCH 08/12] hw/sd/sdcard: Remove sd_none enum from sd_cmd_type_t, Philippe Mathieu-Daudé, 2024/06/28
- [PATCH 09/12] hw/sd/sdcard: Remove noise from sd_acmd_name(), Philippe Mathieu-Daudé, 2024/06/28
- [PATCH 11/12] hw/sd/sdcard: Remove default case in read/write on DAT lines, Philippe Mathieu-Daudé, 2024/06/28
- [PATCH 10/12] hw/sd/sdcard: Remove noise from sd_cmd_name(), Philippe Mathieu-Daudé, 2024/06/28
- [PATCH 12/12] hw/sd/sdcard: Trace length of data read on DAT lines, Philippe Mathieu-Daudé, 2024/06/28