@@ -125,6 +125,7 @@ struct SDState {
uint8_t pwd[16];
uint32_t pwd_len;
uint8_t function_group[6];
+ bool current_cmd_is_acmd;
uint8_t current_cmd;
/* True if we will handle the next command as an ACMD. Note that this does
* *not* track the APP_CMD status bit!
@@ -1704,6 +1705,8 @@ int sd_do_command(SDState *sd, SDRequest *req,
req->cmd);
req->cmd &= 0x3f;
}
+ sd->current_cmd = req->cmd;
+ sd->current_cmd_is_acmd = sd->expecting_acmd;
if (sd->card_status & CARD_IS_LOCKED) {
if (!cmd_valid_while_locked(sd, req->cmd)) {
@@ -1731,7 +1734,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 &= ~CURRENT_STATE;
sd->card_status |= (last_state << 9);
}
@@ -1792,6 +1794,15 @@ send_response:
return rsplen;
}
+static const char *sd_current_cmd_name(SDState *sd)
+{
+ if (sd->current_cmd_is_acmd) {
+ return sd_acmd_name(sd->current_cmd);
+ } else {
+ return sd_cmd_name(sd->current_cmd);
+ }
+}
+
static void sd_blk_read(SDState *sd, uint64_t addr, uint32_t len)
{
trace_sdcard_read_block(addr, len);
@@ -1830,7 +1841,7 @@ void sd_write_data(SDState *sd, uint8_t value)
return;
trace_sdcard_write_data(sd->proto_name,
- sd_acmd_name(sd->current_cmd),
+ sd_current_cmd_name(sd),
sd->current_cmd, value);
switch (sd->current_cmd) {
case 24: /* CMD24: WRITE_SINGLE_BLOCK */
@@ -1984,7 +1995,7 @@ uint8_t sd_read_data(SDState *sd)
io_len = (sd->ocr & (1 << 30)) ? HWBLOCK_SIZE : sd->blk_len;
trace_sdcard_read_data(sd->proto_name,
- sd_acmd_name(sd->current_cmd),
+ sd_current_cmd_name(sd),
sd->current_cmd, io_len);
switch (sd->current_cmd) {
case 6: /* CMD6: SWITCH_FUNCTION */
Some ACMD were incorrectly displayed. Fix by remembering if we are processing a ACMD (with current_cmd_is_acmd) and add the sd_current_cmd_name() helper, which display to correct name regardless it is a CMD or ACMD. Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- hw/sd/sd.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-)