sd/sdhci: Fix Buffer Write Ready interrupt
This interrupt is not risen after the last block is written to sd. It is mutually exclusive with the end of transfer conditions. Fix. Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com> Reviewed-by: Igor Mitsyanko <i.mitsyanko@gmail.com> Message-id: 7ca9fd3e03ce1bec94aff08f607c15a0ec3d3371.1369370934.git.peter.crosthwaite@xilinx.com Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
parent
656f416c65
commit
dcdb4cd850
|
@ -405,15 +405,14 @@ static void sdhci_write_block_to_card(SDHCIState *s)
|
||||||
|
|
||||||
/* Next data can be written through BUFFER DATORT register */
|
/* Next data can be written through BUFFER DATORT register */
|
||||||
s->prnsts |= SDHC_SPACE_AVAILABLE;
|
s->prnsts |= SDHC_SPACE_AVAILABLE;
|
||||||
if (s->norintstsen & SDHC_NISEN_WBUFRDY) {
|
|
||||||
s->norintsts |= SDHC_NIS_WBUFRDY;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Finish transfer if that was the last block of data */
|
/* Finish transfer if that was the last block of data */
|
||||||
if ((s->trnmod & SDHC_TRNS_MULTI) == 0 ||
|
if ((s->trnmod & SDHC_TRNS_MULTI) == 0 ||
|
||||||
((s->trnmod & SDHC_TRNS_MULTI) &&
|
((s->trnmod & SDHC_TRNS_MULTI) &&
|
||||||
(s->trnmod & SDHC_TRNS_BLK_CNT_EN) && (s->blkcnt == 0))) {
|
(s->trnmod & SDHC_TRNS_BLK_CNT_EN) && (s->blkcnt == 0))) {
|
||||||
SDHCI_GET_CLASS(s)->end_data_transfer(s);
|
SDHCI_GET_CLASS(s)->end_data_transfer(s);
|
||||||
|
} else if (s->norintstsen & SDHC_NISEN_WBUFRDY) {
|
||||||
|
s->norintsts |= SDHC_NIS_WBUFRDY;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Generate Block Gap Event if requested and if not the last block */
|
/* Generate Block Gap Event if requested and if not the last block */
|
||||||
|
|
Loading…
Reference in a new issue