diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-09-07 02:41:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-09-07 02:41:38 -0700 |
| commit | 88e1f06c27cc74daececa9e6ad4337cbbfb626a9 (patch) | |
| tree | d8954b5f5e3f8f36e6b5bfaedab5f7f16eede80c /include | |
| parent | 32f6e43157f6e021d68023c778c5c34d30f99b52 (diff) | |
| parent | b0e7d7274cdc8b1a49d364b4d92ab2eda4031bdf (diff) | |
Merge bk://bk.arm.linux.org.uk/linux-2.6-mmc
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mmc/host.h | 8 | ||||
| -rw-r--r-- | include/linux/mmc/mmc.h | 10 |
2 files changed, 17 insertions, 1 deletions
diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h index b2d00f3017fe..f67686cef62a 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h @@ -64,12 +64,18 @@ struct device; struct mmc_host { struct device *dev; struct mmc_host_ops *ops; - void *priv; unsigned int f_min; unsigned int f_max; u32 ocr_avail; char host_name[8]; + /* host specific block data */ + unsigned int max_seg_size; /* see blk_queue_max_segment_size */ + unsigned short max_hw_segs; /* see blk_queue_max_hw_segments */ + unsigned short max_phys_segs; /* see blk_queue_max_phys_segments */ + unsigned short max_sectors; /* see blk_queue_max_sectors */ + unsigned short unused; + /* private data */ struct mmc_ios ios; /* current io bus settings */ u32 ocr; /* the current OCR setting */ diff --git a/include/linux/mmc/mmc.h b/include/linux/mmc/mmc.h index 1b83c2d64561..c288ae6a4f0c 100644 --- a/include/linux/mmc/mmc.h +++ b/include/linux/mmc/mmc.h @@ -28,6 +28,16 @@ struct mmc_command { #define MMC_RSP_CRC (1 << 3) /* expect valid crc */ #define MMC_RSP_BUSY (1 << 4) /* card may send busy */ +/* + * These are the response types, and correspond to valid bit + * patterns of the above flags. One additional valid pattern + * is all zeros, which means we don't expect a response. + */ +#define MMC_RSP_R1 (MMC_RSP_SHORT|MMC_RSP_CRC) +#define MMC_RSP_R1B (MMC_RSP_SHORT|MMC_RSP_CRC|MMC_RSP_BUSY) +#define MMC_RSP_R2 (MMC_RSP_LONG|MMC_RSP_CRC) +#define MMC_RSP_R3 (MMC_RSP_SHORT) + unsigned int retries; /* max number of retries */ unsigned int error; /* command error */ |