aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/mmc
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux/mmc')
-rw-r--r--include/linux/mmc/card.h12
1 files changed, 3 insertions, 9 deletions
diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h
index 800425e05165..badf702fcff4 100644
--- a/include/linux/mmc/card.h
+++ b/include/linux/mmc/card.h
@@ -69,11 +69,9 @@ struct mmc_card {
69#define MMC_TYPE_SD 1 /* SD card */ 69#define MMC_TYPE_SD 1 /* SD card */
70 unsigned int state; /* (our) card state */ 70 unsigned int state; /* (our) card state */
71#define MMC_STATE_PRESENT (1<<0) /* present in sysfs */ 71#define MMC_STATE_PRESENT (1<<0) /* present in sysfs */
72#define MMC_STATE_DEAD (1<<1) /* device no longer in stack */ 72#define MMC_STATE_READONLY (1<<1) /* card is read-only */
73#define MMC_STATE_BAD (1<<2) /* unrecognised device */ 73#define MMC_STATE_HIGHSPEED (1<<2) /* card is in high speed mode */
74#define MMC_STATE_READONLY (1<<3) /* card is read-only */ 74#define MMC_STATE_BLOCKADDR (1<<3) /* card uses block-addressing */
75#define MMC_STATE_HIGHSPEED (1<<4) /* card is in high speed mode */
76#define MMC_STATE_BLOCKADDR (1<<5) /* card uses block-addressing */
77 u32 raw_cid[4]; /* raw card CID */ 75 u32 raw_cid[4]; /* raw card CID */
78 u32 raw_csd[4]; /* raw card CSD */ 76 u32 raw_csd[4]; /* raw card CSD */
79 u32 raw_scr[2]; /* raw card SCR */ 77 u32 raw_scr[2]; /* raw card SCR */
@@ -88,15 +86,11 @@ struct mmc_card {
88#define mmc_card_sd(c) ((c)->type == MMC_TYPE_SD) 86#define mmc_card_sd(c) ((c)->type == MMC_TYPE_SD)
89 87
90#define mmc_card_present(c) ((c)->state & MMC_STATE_PRESENT) 88#define mmc_card_present(c) ((c)->state & MMC_STATE_PRESENT)
91#define mmc_card_dead(c) ((c)->state & MMC_STATE_DEAD)
92#define mmc_card_bad(c) ((c)->state & MMC_STATE_BAD)
93#define mmc_card_readonly(c) ((c)->state & MMC_STATE_READONLY) 89#define mmc_card_readonly(c) ((c)->state & MMC_STATE_READONLY)
94#define mmc_card_highspeed(c) ((c)->state & MMC_STATE_HIGHSPEED) 90#define mmc_card_highspeed(c) ((c)->state & MMC_STATE_HIGHSPEED)
95#define mmc_card_blockaddr(c) ((c)->state & MMC_STATE_BLOCKADDR) 91#define mmc_card_blockaddr(c) ((c)->state & MMC_STATE_BLOCKADDR)
96 92
97#define mmc_card_set_present(c) ((c)->state |= MMC_STATE_PRESENT) 93#define mmc_card_set_present(c) ((c)->state |= MMC_STATE_PRESENT)
98#define mmc_card_set_dead(c) ((c)->state |= MMC_STATE_DEAD)
99#define mmc_card_set_bad(c) ((c)->state |= MMC_STATE_BAD)
100#define mmc_card_set_readonly(c) ((c)->state |= MMC_STATE_READONLY) 94#define mmc_card_set_readonly(c) ((c)->state |= MMC_STATE_READONLY)
101#define mmc_card_set_highspeed(c) ((c)->state |= MMC_STATE_HIGHSPEED) 95#define mmc_card_set_highspeed(c) ((c)->state |= MMC_STATE_HIGHSPEED)
102#define mmc_card_set_blockaddr(c) ((c)->state |= MMC_STATE_BLOCKADDR) 96#define mmc_card_set_blockaddr(c) ((c)->state |= MMC_STATE_BLOCKADDR)