From fb1ba03ab064ae2e2e8248df81a7cad805dbe9d8 Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Fri, 18 Feb 2011 13:39:00 +0000 Subject: [PATCH] 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 Signed-off-by: Aurelien Jarno --- hw/sd.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hw/sd.c b/hw/sd.c index 789ca84785..5e29752d90 100644 --- a/hw/sd.c +++ b/hw/sd.c @@ -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;