[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 13/18] sdcard: simplify SEND_IF_COND (CMD8)
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-devel] [PATCH v3 13/18] sdcard: simplify SEND_IF_COND (CMD8) |
Date: |
Tue, 23 Jan 2018 00:30:29 -0300 |
replace switch(single case) -> if()
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
hw/sd/sd.c | 26 +++++++++++---------------
1 file changed, 11 insertions(+), 15 deletions(-)
diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index b5c947df62..707c294169 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -1015,23 +1015,19 @@ static sd_rsp_type_t sd_normal_command(SDState *sd,
SDRequest req)
case 8: /* CMD8: SEND_IF_COND */
/* Physical Layer Specification Version 2.00 command */
- switch (sd->state) {
- case sd_idle_state:
- sd->vhs = 0;
-
- /* No response if not exactly one VHS bit is set. */
- if (!(req.arg >> 8) || (req.arg >> (ctz32(req.arg & ~0xff) + 1))) {
- return sd->spi ? sd_r7 : sd_r0;
- }
-
- /* Accept. */
- sd->vhs = req.arg;
- return sd_r7;
-
- default:
+ if (sd->state != sd_idle_state) {
break;
}
- break;
+ sd->vhs = 0;
+
+ /* No response if not exactly one VHS bit is set. */
+ if (!(req.arg >> 8) || (req.arg >> (ctz32(req.arg & ~0xff) + 1))) {
+ return sd->spi ? sd_r7 : sd_r0;
+ }
+
+ /* Accept. */
+ sd->vhs = req.arg;
+ return sd_r7;
case 9: /* CMD9: SEND_CSD */
switch (sd->state) {
--
2.15.1
- Re: [Qemu-devel] [PATCH v3 07/18] sdcard: use the correct masked OCR in the R3 reply, (continued)
- [Qemu-devel] [PATCH v3 08/18] sdcard: use the registerfields API for the CARD_STATUS register masks, Philippe Mathieu-Daudé, 2018/01/22
- [Qemu-devel] [PATCH v3 09/18] sdcard: handles more commands in SPI mode, Philippe Mathieu-Daudé, 2018/01/22
- [Qemu-devel] [PATCH v3 10/18] sdcard: handle CMD54 (SDIO), Philippe Mathieu-Daudé, 2018/01/22
- [Qemu-devel] [PATCH v3 11/18] sdcard: check the card is in correct state for APP CMD (CMD55), Philippe Mathieu-Daudé, 2018/01/22
- [Qemu-devel] [PATCH v3 12/18] sdcard: warn if host uses an incorrect address for APP CMD (CMD55), Philippe Mathieu-Daudé, 2018/01/22
- [Qemu-devel] [PATCH v3 13/18] sdcard: simplify SEND_IF_COND (CMD8),
Philippe Mathieu-Daudé <=
- [Qemu-devel] [PATCH v3 14/18] sdcard: simplify SD_SEND_OP_COND (ACMD41), Philippe Mathieu-Daudé, 2018/01/22
- [Qemu-devel] [PATCH v3 15/18] sdcard: add SD SEND_TUNING_BLOCK (CMD19), Philippe Mathieu-Daudé, 2018/01/22
- [Qemu-devel] [PATCH v3 16/18] sdcard: add a 'uhs' property, update the OCR register ACCEPT_SWITCH_1V8 bit, Philippe Mathieu-Daudé, 2018/01/22
- [Qemu-devel] [PATCH v3 17/18] sdcard: implement the UHS-I SWITCH_FUNCTION entries (Spec v3), Philippe Mathieu-Daudé, 2018/01/22
- [Qemu-devel] [PATCH v3 18/18] sdcard: add an enum for the SD PHY Spec version, Philippe Mathieu-Daudé, 2018/01/22