summaryrefslogtreecommitdiffstats
path: root/include/hw
diff options
context:
space:
mode:
authorAndrew Baumann2016-02-25 22:35:29 +0100
committerPeter Maydell2016-02-26 16:09:42 +0100
commit5c1bc9a234704c3d2001e7751b2d33145202a35f (patch)
tree9cd67196640281515fce91ab304830f1aec4ab5a /include/hw
parentMAINTAINERS: Add some missing ARM related header files (diff)
downloadqemu-5c1bc9a234704c3d2001e7751b2d33145202a35f.tar.gz
qemu-5c1bc9a234704c3d2001e7751b2d33145202a35f.tar.xz
qemu-5c1bc9a234704c3d2001e7751b2d33145202a35f.zip
sdhci: Revert "add optional quirk property to disable card insertion/removal interrupts"
This reverts commit 723697551a7e926abe7d3c7f2966012b8075143d. This change was poorly tested on my part. It squelched card insertion interrupts on reset, but that was not necessary because sdhci_reset() clears all the registers (via the call to memset), so the subsequent sdhci_insert_eject_cb() call never sees the card insert interrupt enabled. However, not calling the insert_eject_cb results in prnsts remaining 0, when it actually needs to be updated to indicate card presence and R/O status. Signed-off-by: Andrew Baumann <Andrew.Baumann@microsoft.com> Message-id: 1456436130-7048-2-git-send-email-Andrew.Baumann@microsoft.com Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/hw')
-rw-r--r--include/hw/sd/sdhci.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/hw/sd/sdhci.h b/include/hw/sd/sdhci.h
index 607a83e855..4816516a26 100644
--- a/include/hw/sd/sdhci.h
+++ b/include/hw/sd/sdhci.h
@@ -76,7 +76,6 @@ typedef struct SDHCIState {
uint32_t buf_maxsz;
uint16_t data_count; /* current element in FIFO buffer */
uint8_t stopped_state;/* Current SDHC state */
- bool noeject_quirk;/* Quirk to disable card insert/remove interrupts */
/* Buffer Data Port Register - virtual access point to R and W buffers */
/* Software Reset Register - always reads as 0 */
/* Force Event Auto CMD12 Error Interrupt Reg - write only */