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

sdcard: simplify SD_SEND_OP_COND (ACMD41) 

replace switch(single case) -> if()

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Alistair Francis <alistair.francis@xilinx.com>
Message-id: 20180215221325.7611-17-f4bug@amsat.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2018-02-22 15:12:54 +00:00 committed by Peter Maydell
parent ad0ade5547
commit 4e5cc67565
1 changed files with 26 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hw/sd/sd.c
View File

@ -1512,8 +1512,9 @@ static sd_rsp_type_t sd_app_command(SDState *sd,
sd->state = sd_transfer_state; sd->state = sd_transfer_state;
return sd_r1; return sd_r1;
} }
switch (sd->state) { if (sd->state != sd_idle_state) {
case sd_idle_state: break;
}
/* If it's the first ACMD41 since reset, we need to decide /* If it's the first ACMD41 since reset, we need to decide
* whether to power up. If this is not an enquiry ACMD41, * whether to power up. If this is not an enquiry ACMD41,
* we immediately report power on and proceed below to the * we immediately report power on and proceed below to the
@ -1536,22 +1537,17 @@ static sd_rsp_type_t sd_app_command(SDState *sd,
} }
} }
if (FIELD_EX32(sd->ocr & req.arg, OCR, VDD_VOLTAGE_WINDOW)) {
/* We accept any voltage. 10000 V is nothing. /* We accept any voltage. 10000 V is nothing.
* *
* Once we're powered up, we advance straight to ready state * Once we're powered up, we advance straight to ready state
* unless it's an enquiry ACMD41 (bits 23:0 == 0). * unless it's an enquiry ACMD41 (bits 23:0 == 0).
*/ */
if (req.arg & ACMD41_ENQUIRY_MASK) {
sd->state = sd_ready_state; sd->state = sd_ready_state;
} }
return sd_r3; return sd_r3;
default:
break;
}
break;
case 42: /* ACMD42: SET_CLR_CARD_DETECT */ case 42: /* ACMD42: SET_CLR_CARD_DETECT */
switch (sd->state) { switch (sd->state) {
case sd_transfer_state: case sd_transfer_state: