[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 09/16] hw/sd/sdcard: Remove sd_none enum from sd_cmd_type_t
From: |
Philippe Mathieu-Daudé |
Subject: |
[PULL 09/16] hw/sd/sdcard: Remove sd_none enum from sd_cmd_type_t |
Date: |
Sat, 6 Jul 2024 00:04:27 +0200 |
All handlers using the 'sd_none' enum got converted,
remove it.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Tested-by: Andrew Jeffery <andrew@codeconstruct.com.au>
Tested-by: Cédric Le Goater <clg@redhat.com>
Message-Id: <20240628070216.92609-76-philmd@linaro.org>
---
include/hw/sd/sd.h | 1 -
hw/sd/sd.c | 7 +------
2 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/include/hw/sd/sd.h b/include/hw/sd/sd.h
index 29c76935a0..c1a35ab420 100644
--- a/include/hw/sd/sd.h
+++ b/include/hw/sd/sd.h
@@ -76,7 +76,6 @@ typedef enum {
} sd_uhs_mode_t;
typedef enum {
- sd_none = 0,
sd_spi,
sd_bc, /* broadcast -- no response */
sd_bcr, /* broadcast with response */
diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index 10f2764a53..43f60cf089 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -524,17 +524,12 @@ static void sd_set_rca(SDState *sd, uint16_t value)
static uint16_t sd_req_get_rca(SDState *s, SDRequest req)
{
switch (s->proto->cmd[req.cmd].type) {
- case sd_none:
- /* Called from legacy code not ported to SDProto array */
- assert(!s->proto->cmd[req.cmd].handler);
- /* fall-through */
case sd_ac:
case sd_adtc:
return req.arg >> 16;
case sd_spi:
- g_assert_not_reached();
default:
- return 0;
+ g_assert_not_reached();
}
}
--
2.41.0
- [PULL 00/16] SD/MMC patches for 2024-07-06, Philippe Mathieu-Daudé, 2024/07/05
- [PULL 01/16] hw/sd/sdhci: Log non-sequencial access as GUEST_ERROR, Philippe Mathieu-Daudé, 2024/07/05
- [PULL 02/16] hw/sd/npcm7xx_sdhci: Use TYPE_SYSBUS_SDHCI definition, Philippe Mathieu-Daudé, 2024/07/05
- [PULL 03/16] tests/qtest/npcm7xx_sdhci: Access the card using its published address, Philippe Mathieu-Daudé, 2024/07/05
- [PULL 04/16] hw/sd/sdcard: Generate random RCA value, Philippe Mathieu-Daudé, 2024/07/05
- [PULL 05/16] hw/sd/sdcard: Remove leftover comment about removed 'spi' Property, Philippe Mathieu-Daudé, 2024/07/05
- [PULL 06/16] hw/sd/sdcard: Use spec v3.01 by default, Philippe Mathieu-Daudé, 2024/07/05
- [PULL 07/16] hw/sd/sdcard: Rename sd_cmd_SEND_OP_COND handler, Philippe Mathieu-Daudé, 2024/07/05
- [PULL 08/16] hw/sd/sdcard: Add sd_cmd_GEN_CMD handler (CMD56), Philippe Mathieu-Daudé, 2024/07/05
- [PULL 09/16] hw/sd/sdcard: Remove sd_none enum from sd_cmd_type_t,
Philippe Mathieu-Daudé <=
- [PULL 10/16] hw/sd/sdcard: Remove noise from sd_acmd_name(), Philippe Mathieu-Daudé, 2024/07/05
- [PULL 11/16] hw/sd/sdcard: Remove noise from sd_cmd_name(), Philippe Mathieu-Daudé, 2024/07/05
- [PULL 12/16] hw/sd/sdcard: Remove default case in read/write on DAT lines, Philippe Mathieu-Daudé, 2024/07/05
- [PULL 14/16] hw/sd/sdcard: Cover more SDCardStates, Philippe Mathieu-Daudé, 2024/07/05
- [PULL 13/16] hw/sd/sdcard: Trace length of data read on DAT lines, Philippe Mathieu-Daudé, 2024/07/05
- [PULL 15/16] hw/sd/sdcard: Introduce set_csd/set_cid handlers, Philippe Mathieu-Daudé, 2024/07/05
- [PULL 16/16] hw/sd/sdcard: Extract TYPE_SDMMC_COMMON from TYPE_SD_CARD, Philippe Mathieu-Daudé, 2024/07/05
- Re: [PULL 00/16] SD/MMC patches for 2024-07-06, Richard Henderson, 2024/07/07