[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 12/16] hw/sd/sdcard: Remove default case in read/write on DAT line
From: |
Philippe Mathieu-Daudé |
Subject: |
[PULL 12/16] hw/sd/sdcard: Remove default case in read/write on DAT lines |
Date: |
Sat, 6 Jul 2024 00:04:30 +0200 |
All read/write on DAT lines are explicitly handled.
Reaching this point would be a programming error:
replace by an assertion.
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-79-philmd@linaro.org>
---
hw/sd/sd.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index bc1a574b62..3f495f91fe 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -1949,7 +1949,6 @@ int sd_do_command(SDState *sd, SDRequest *req,
/* Valid command, we can update the 'state before command' bits.
* (Do this now so they appear in r1 responses.)
*/
- sd->current_cmd = req->cmd;
sd->card_status = FIELD_DP32(sd->card_status, CSR,
CURRENT_STATE, last_state);
}
@@ -2014,6 +2013,8 @@ send_response:
qemu_hexdump(stderr, "Response", response, rsplen);
#endif
+ sd->current_cmd = rtype == sd_illegal ? 0 : req->cmd;
+
return rsplen;
}
@@ -2167,8 +2168,7 @@ void sd_write_byte(SDState *sd, uint8_t value)
break;
default:
- qemu_log_mask(LOG_GUEST_ERROR, "%s: unknown command\n", __func__);
- break;
+ g_assert_not_reached();
}
}
@@ -2234,8 +2234,7 @@ uint8_t sd_read_byte(SDState *sd)
break;
default:
- qemu_log_mask(LOG_GUEST_ERROR, "%s: unknown command\n", __func__);
- return 0x00;
+ g_assert_not_reached();
}
return ret;
--
2.41.0
- [PULL 03/16] tests/qtest/npcm7xx_sdhci: Access the card using its published address, (continued)
- [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é, 2024/07/05
- [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é <=
- [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