diff options
author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-17 12:04:46 +0100 |
---|---|---|
committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-17 12:04:46 +0100 |
commit | 69887ac1dcb79dfc773dabac2dd081fa6d6e2573 (patch) | |
tree | 23a4f685c71ff8666548b0a01b221928e46a9287 /drivers/mmc/wbsd.h | |
parent | 5e014b10ef8477c32a939a48fa02aedcad35a226 (diff) | |
parent | 118326e940bdecef6c459d42ccf05256ba86daa7 (diff) |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/mmc/wbsd.h')
-rw-r--r-- | drivers/mmc/wbsd.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/mmc/wbsd.h b/drivers/mmc/wbsd.h index fdc03b56a81f..864f30828d01 100644 --- a/drivers/mmc/wbsd.h +++ b/drivers/mmc/wbsd.h @@ -35,6 +35,12 @@ const int valid_ids[] = { #define DEVICE_SD 0x03 +#define WBSD_PINS_DAT3_HI 0x20 +#define WBSD_PINS_DAT3_OUT 0x10 +#define WBSD_PINS_GP11_HI 0x04 +#define WBSD_PINS_DETECT_GP11 0x02 +#define WBSD_PINS_DETECT_DAT3 0x01 + #define WBSD_CMDR 0x00 #define WBSD_DFR 0x01 #define WBSD_EIR 0x02 @@ -133,6 +139,7 @@ const int valid_ids[] = { #define WBSD_CRC_OK 0x05 /* S010E (00101) */ #define WBSD_CRC_FAIL 0x0B /* S101E (01011) */ +#define WBSD_DMA_SIZE 65536 struct wbsd_host { @@ -140,6 +147,11 @@ struct wbsd_host spinlock_t lock; /* Mutex */ + int flags; /* Driver states */ + +#define WBSD_FCARD_PRESENT (1<<0) /* Card is present */ +#define WBSD_FIGNORE_DETECT (1<<1) /* Ignore card detection */ + struct mmc_request* mrq; /* Current request */ u8 isr; /* Accumulated ISR */ |