[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 06/12] hw/sd/sdcard: Add sd_acmd_SET_CLR_CARD_DETECT handler (ACM
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 06/12] hw/sd/sdcard: Add sd_acmd_SET_CLR_CARD_DETECT handler (ACMD42) |
Date: |
Fri, 28 Jun 2024 06:53:17 +0200 |
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
hw/sd/sd.c | 25 +++++++++++++------------
1 file changed, 13 insertions(+), 12 deletions(-)
diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index 167e1c517a..a27a7e0f24 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -263,7 +263,6 @@ static const char *sd_acmd_name(SDState *sd, uint8_t cmd)
[14] = "DPS_spec", [15] = "DPS_spec",
[16] = "DPS_spec",
[18] = "SECU_spec",
- [42] = "SET_CLR_CARD_DETECT",
[51] = "SEND_SCR",
[52] = "SECU_spec", [53] = "SECU_spec",
[54] = "SECU_spec",
@@ -1748,6 +1747,17 @@ static sd_rsp_type_t sd_acmd_SD_APP_OP_COND(SDState *sd,
SDRequest req)
return sd_r3;
}
+/* ACMD42 */
+static sd_rsp_type_t sd_acmd_SET_CLR_CARD_DETECT(SDState *sd, SDRequest req)
+{
+ if (sd->state != sd_transfer_state) {
+ return sd_invalid_state_for_cmd(sd, req);
+ }
+
+ /* Bringing in the 50KOhm pull-up resistor... Done. */
+ return sd_r1;
+}
+
static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)
{
uint64_t addr;
@@ -1856,17 +1866,6 @@ static sd_rsp_type_t sd_app_command(SDState *sd,
}
switch (req.cmd) {
- case 42: /* ACMD42: SET_CLR_CARD_DETECT */
- switch (sd->state) {
- case sd_transfer_state:
- /* Bringing in the 50KOhm pull-up resistor... Done. */
- return sd_r1;
-
- default:
- break;
- }
- break;
-
case 51: /* ACMD51: SEND_SCR */
switch (sd->state) {
case sd_transfer_state:
@@ -2327,6 +2326,7 @@ static const SDProto sd_proto_spi = {
[22] = {8, sd_spi, "SEND_NUM_WR_BLOCKS", sd_acmd_SEND_NUM_WR_BLOCKS},
[23] = {8, sd_spi, "SET_WR_BLK_ERASE_COUNT",
sd_acmd_SET_WR_BLK_ERASE_COUNT},
[41] = {8, sd_spi, "SEND_OP_COND", spi_cmd_SEND_OP_COND},
+ [42] = {8, sd_spi, "SET_CLR_CARD_DETECT",
sd_acmd_SET_CLR_CARD_DETECT},
},
};
@@ -2387,6 +2387,7 @@ static const SDProto sd_proto_sd = {
[22] = {8, sd_adtc, "SEND_NUM_WR_BLOCKS", sd_acmd_SEND_NUM_WR_BLOCKS},
[23] = {8, sd_ac, "SET_WR_BLK_ERASE_COUNT",
sd_acmd_SET_WR_BLK_ERASE_COUNT},
[41] = {8, sd_bcr, "SD_APP_OP_COND", sd_acmd_SD_APP_OP_COND},
+ [42] = {8, sd_ac, "SET_CLR_CARD_DETECT",
sd_acmd_SET_CLR_CARD_DETECT},
},
};
--
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é, 2024/06/28
- [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é <=
- [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