aboutsummaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorPhilippe Mathieu-Daudé <philmd@linaro.org>2024-06-16 12:39:18 +0200
committerPhilippe Mathieu-Daudé <philmd@linaro.org>2024-07-05 23:54:46 +0200
commite2dec2eab04db00ad718353b77adfd59dd5ee3db (patch)
tree4843097df17e4d8779a41560a08f74a3262f476a /hw
parent48741580a8e4b7e18406962425ce608e2ef0c6f4 (diff)
downloadqemu-e2dec2eab04db00ad718353b77adfd59dd5ee3db.zip
qemu-e2dec2eab04db00ad718353b77adfd59dd5ee3db.tar.gz
qemu-e2dec2eab04db00ad718353b77adfd59dd5ee3db.tar.bz2
hw/sd/sdcard: Remove default case in read/write on DAT lines
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>
Diffstat (limited to 'hw')
-rw-r--r--hw/sd/sd.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index bc1a574..3f495f9 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;