proxmox-mirrors/qemu
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu synced 2025-08-08 10:44:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

sd/sd.c: Fix "inquiry" ACMD41

Browse Source 
QEMU models two (of the three) ACMD41 has two modes, "inquiry" and
"first". The selection logic for which of the two is incorrect - it
compares != 0 for the entire argument value rather than only bits 23:0
as per the spec. Fix.

Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Message-id: 3ef0a7fd1b2f3ebb23b4fdeabcc14caf3fad6d71.1369622254.git.peter.crosthwaite@xilinx.com
Reviewed-by: Igor Mitsyanko <i.mitsyanko@gmail.com>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Crosthwaite 2013-06-03 17:17:45 +01:00 committed by Peter Maydell
parent 1d32c26f28
commit 37ab4a5668
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hw/sd/sd.c
View File

@ -43,6 +43,8 @@ do { fprintf(stderr, "SD: " fmt , ## __VA_ARGS__); } while (0)
#define DPRINTF(fmt, ...) do {} while(0) #define DPRINTF(fmt, ...) do {} while(0)
#endif #endif
#define ACMD41_ENQUIRY_MASK 0x00ffffff
typedef enum { typedef enum {
sd_r0 = 0, /* no response */ sd_r0 = 0, /* no response */
sd_r1, /* normal response command */ sd_r1, /* normal response command */
@ -1277,9 +1279,14 @@ static sd_rsp_type_t sd_app_command(SDState *sd,
} }
switch (sd->state) { switch (sd->state) {
case sd_idle_state: case sd_idle_state:
/* We accept any voltage. 10000 V is nothing. */ /* We accept any voltage. 10000 V is nothing.
if (req.arg) *
* We don't model init delay so just advance straight to ready state
* 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;