Commit 724d3a8f2932f90e3527752f4b59f3607ceeb863
1 parent
330c4d61
Re-add clearing of the APP_CMD flag that somehow got lost.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3094 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
2 changed files
with
5 additions
and
4 deletions
hw/sd.c
| @@ -1151,9 +1151,10 @@ int sd_do_command(SDState *sd, struct sd_request_s *req, | @@ -1151,9 +1151,10 @@ int sd_do_command(SDState *sd, struct sd_request_s *req, | ||
| 1151 | return 0; | 1151 | return 0; |
| 1152 | } | 1152 | } |
| 1153 | 1153 | ||
| 1154 | - if (last_status & APP_CMD) | 1154 | + if (last_status & APP_CMD) { |
| 1155 | rtype = sd_app_command(sd, *req); | 1155 | rtype = sd_app_command(sd, *req); |
| 1156 | - else | 1156 | + sd->card_status &= ~APP_CMD; |
| 1157 | + } else | ||
| 1157 | rtype = sd_normal_command(sd, *req); | 1158 | rtype = sd_normal_command(sd, *req); |
| 1158 | 1159 | ||
| 1159 | sd->current_cmd = req->cmd; | 1160 | sd->current_cmd = req->cmd; |
hw/sd.h
| @@ -56,8 +56,8 @@ | @@ -56,8 +56,8 @@ | ||
| 56 | typedef enum { | 56 | typedef enum { |
| 57 | sd_none = -1, | 57 | sd_none = -1, |
| 58 | sd_bc = 0, /* broadcast -- no response */ | 58 | sd_bc = 0, /* broadcast -- no response */ |
| 59 | - sd_bcr, /* broadcast with response */ | ||
| 60 | - sd_ac, /* addressed -- no data transfer */ | 59 | + sd_bcr, /* broadcast with response */ |
| 60 | + sd_ac, /* addressed -- no data transfer */ | ||
| 61 | sd_adtc, /* addressed with data transfer */ | 61 | sd_adtc, /* addressed with data transfer */ |
| 62 | } sd_cmd_type_t; | 62 | } sd_cmd_type_t; |
| 63 | 63 |