ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/sd/sdcard: Simplify cmd_valid_while_locked() 

cmd_valid_while_locked() only needs to read SDRequest->cmd,
pass it directly and make it const.

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Message-Id: <20200630133912.9428-13-f4bug@amsat.org>
This commit is contained in:
Philippe Mathieu-Daudé 2018-06-26 14:46:44 -03:00
parent 9820502cad
commit ef6dd5f5c4
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hw/sd/sd.c
View File

@ -1679,7 +1679,7 @@ static sd_rsp_type_t sd_app_command(SDState *sd,
return sd_illegal; return sd_illegal;
} }
static int cmd_valid_while_locked(SDState *sd, SDRequest *req) static int cmd_valid_while_locked(SDState *sd, const uint8_t cmd)
{ {
/* Valid commands in locked state: /* Valid commands in locked state:
* basic class (0) * basic class (0)
@ -1690,13 +1690,12 @@ static int cmd_valid_while_locked(SDState *sd, SDRequest *req)
* Anything else provokes an "illegal command" response. * Anything else provokes an "illegal command" response.
*/ */
if (sd->expecting_acmd) { if (sd->expecting_acmd) {
return req->cmd == 41 || req->cmd == 42; return cmd == 41 || cmd == 42;
} }
if (req->cmd == 16 || req->cmd == 55) { if (cmd == 16 || cmd == 55) {
return 1; return 1;
} }
return sd_cmd_class[req->cmd] == 0 return sd_cmd_class[cmd] == 0 || sd_cmd_class[cmd] == 7;
|| sd_cmd_class[req->cmd] == 7;
} }
int sd_do_command(SDState *sd, SDRequest *req, int sd_do_command(SDState *sd, SDRequest *req,
@ -1722,7 +1721,7 @@ int sd_do_command(SDState *sd, SDRequest *req,
} }
if (sd->card_status & CARD_IS_LOCKED) { if (sd->card_status & CARD_IS_LOCKED) {
if (!cmd_valid_while_locked(sd, req)) { if (!cmd_valid_while_locked(sd, req->cmd)) {
sd->card_status |= ILLEGAL_COMMAND; sd->card_status |= ILLEGAL_COMMAND;
sd->expecting_acmd = false; sd->expecting_acmd = false;
qemu_log_mask(LOG_GUEST_ERROR, "SD: Card is locked\n"); qemu_log_mask(LOG_GUEST_ERROR, "SD: Card is locked\n");