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

56
hw/sd/sd.c
View File

@ -1512,45 +1512,41 @@ 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 }
* whether to power up. If this is not an enquiry ACMD41, /* If it's the first ACMD41 since reset, we need to decide
* we immediately report power on and proceed below to the * whether to power up. If this is not an enquiry ACMD41,
* ready state, but if it is, we set a timer to model a * we immediately report power on and proceed below to the
* delay for power up. This works around a bug in EDK2 * ready state, but if it is, we set a timer to model a
* UEFI, which sends an initial enquiry ACMD41, but * delay for power up. This works around a bug in EDK2
* assumes that the card is in ready state as soon as it * UEFI, which sends an initial enquiry ACMD41, but
* sees the power up bit set. */ * assumes that the card is in ready state as soon as it
if (!FIELD_EX32(sd->ocr, OCR, CARD_POWER_UP)) { * sees the power up bit set. */
if ((req.arg & ACMD41_ENQUIRY_MASK) != 0) { if (!FIELD_EX32(sd->ocr, OCR, CARD_POWER_UP)) {
timer_del(sd->ocr_power_timer); if ((req.arg & ACMD41_ENQUIRY_MASK) != 0) {
sd_ocr_powerup(sd); timer_del(sd->ocr_power_timer);
} else { sd_ocr_powerup(sd);
trace_sdcard_inquiry_cmd41(); } else {
if (!timer_pending(sd->ocr_power_timer)) { trace_sdcard_inquiry_cmd41();
timer_mod_ns(sd->ocr_power_timer, if (!timer_pending(sd->ocr_power_timer)) {
(qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) timer_mod_ns(sd->ocr_power_timer,
+ OCR_POWER_DELAY_NS)); (qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL)
} + OCR_POWER_DELAY_NS));
} }
} }
}
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;
default:
break;
} }
break;
return sd_r3;
case 42: /* ACMD42: SET_CLR_CARD_DETECT */ case 42: /* ACMD42: SET_CLR_CARD_DETECT */
switch (sd->state) { switch (sd->state) {