diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2011-02-18 13:39:00 +0000 |
|---|---|---|
| committer | Aurelien Jarno <aurelien@aurel32.net> | 2011-02-24 08:53:36 +0100 |
| commit | fb1ba03ab064ae2e2e8248df81a7cad805dbe9d8 (patch) | |
| tree | ffc16ccda4e90f5188c1d4445b55c85f6d272386 /hw/sd.c | |
| parent | 5db8378a7710df7899544004967597eb395418c2 (diff) | |
| download | qemu-fb1ba03ab064ae2e2e8248df81a7cad805dbe9d8.tar.gz qemu-fb1ba03ab064ae2e2e8248df81a7cad805dbe9d8.tar.bz2 qemu-fb1ba03ab064ae2e2e8248df81a7cad805dbe9d8.zip | |
hw/sd.c: Add missing state change for SD_STATUS, SEND_NUM_WR_BLOCKS
The SD_STATUS and SEND_NUM_WR_BLOCKS commands are supposed to cause
the card to send data back to the host. However sd.c was missing the
state change to sd_sendingdata_state for these commands, with the effect
that the Linux driver would either hang indefinitely waiting for
nonexistent data (pl181) or read zeroes and provoke a qemu warning
message (omap).
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
Diffstat (limited to 'hw/sd.c')
| -rw-r--r-- | hw/sd.c | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -1168,6 +1168,7 @@ static sd_rsp_type_t sd_app_command(SDState *sd, case 13: /* ACMD13: SD_STATUS */ switch (sd->state) { case sd_transfer_state: + sd->state = sd_sendingdata_state; sd->data_start = 0; sd->data_offset = 0; return sd_r1; @@ -1182,6 +1183,7 @@ static sd_rsp_type_t sd_app_command(SDState *sd, case sd_transfer_state: *(uint32_t *) sd->data = sd->blk_written; + sd->state = sd_sendingdata_state; sd->data_start = 0; sd->data_offset = 0; return sd_r1; |