[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 2/5] hw/sd/sdcard: Simplify cmd_valid_while_locked()
From: |
Philippe Mathieu-Daudé |
Subject: |
[PULL 2/5] hw/sd/sdcard: Simplify cmd_valid_while_locked() |
Date: |
Mon, 26 Oct 2020 12:03:12 +0100 |
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>
---
hw/sd/sd.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index 9b53053527e..5510a64401b 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -1679,7 +1679,7 @@ static sd_rsp_type_t sd_app_command(SDState *sd,
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:
* basic class (0)
@@ -1690,13 +1690,12 @@ static int cmd_valid_while_locked(SDState *sd,
SDRequest *req)
* Anything else provokes an "illegal command" response.
*/
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 sd_cmd_class[req->cmd] == 0
- || sd_cmd_class[req->cmd] == 7;
+ return sd_cmd_class[cmd] == 0 || sd_cmd_class[cmd] == 7;
}
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 (!cmd_valid_while_locked(sd, req)) {
+ if (!cmd_valid_while_locked(sd, req->cmd)) {
sd->card_status |= ILLEGAL_COMMAND;
sd->expecting_acmd = false;
qemu_log_mask(LOG_GUEST_ERROR, "SD: Card is locked\n");
--
2.26.2
- [PULL 0/5] SD/MMC patches for 2020-10-26, Philippe Mathieu-Daudé, 2020/10/26
- [PULL 1/5] hw/sd/sdcard: Update the SDState documentation, Philippe Mathieu-Daudé, 2020/10/26
- [PULL 2/5] hw/sd/sdcard: Simplify cmd_valid_while_locked(),
Philippe Mathieu-Daudé <=
- [PULL 3/5] hw/sd/sdcard: Constify sd_crc*()'s message argument, Philippe Mathieu-Daudé, 2020/10/26
- [PULL 5/5] hw/sd/sdcard: Zero out function selection fields before being populated, Philippe Mathieu-Daudé, 2020/10/26
- [PULL 4/5] hw/sd/sdcard: Make iolen unsigned, Philippe Mathieu-Daudé, 2020/10/26
- Re: [PULL 0/5] SD/MMC patches for 2020-10-26, Peter Maydell, 2020/10/26