[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 11/12] hw/sd/sdcard: Remove default case in read/write on DAT lin
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 11/12] hw/sd/sdcard: Remove default case in read/write on DAT lines |
Date: |
Fri, 28 Jun 2024 06:53:22 +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>
---
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 0a7b422b2c..64621d4340 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -1951,7 +1951,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);
}
@@ -2016,6 +2015,8 @@ send_response:
qemu_hexdump(stderr, "Response", response, rsplen);
#endif
+ sd->current_cmd = rtype == sd_illegal ? 0 : req->cmd;
+
return rsplen;
}
@@ -2171,8 +2172,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();
}
}
@@ -2238,8 +2238,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
- [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é, 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é <=
- [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