summaryrefslogtreecommitdiff
path: root/include/linux/mmc
diff options
context:
space:
mode:
authorPierre Ossman <drzeus@drzeus.cx>2007-07-30 17:15:30 +0400
committerPierre Ossman <drzeus@drzeus.cx>2007-09-23 22:44:22 +0400
commit1a632f8cdc33e7f8edca352164f0c96a75d08f08 (patch)
tree6cc3174285ee11df586ae89cf0040ba2429a83f0 /include/linux/mmc
parentb1538bcf75e2e11459947ec4d4329ed04fbe2b2c (diff)
downloadlinux-1a632f8cdc33e7f8edca352164f0c96a75d08f08.tar.xz
sdio: split up common and function CIS parsing
Add a more clean separation between global, common CIS information and the function specific one as we need the common information in places where no specific function is specified. Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
Diffstat (limited to 'include/linux/mmc')
-rw-r--r--include/linux/mmc/card.h10
-rw-r--r--include/linux/mmc/sdio_func.h2
2 files changed, 12 insertions, 0 deletions
diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h
index 520d9d29b3b2..a444431e28bd 100644
--- a/include/linux/mmc/card.h
+++ b/include/linux/mmc/card.h
@@ -65,8 +65,16 @@ struct sdio_cccr {
high_speed:1;
};
+struct sdio_cis {
+ unsigned short vendor;
+ unsigned short device;
+ unsigned short blksize;
+ unsigned int max_dtr;
+};
+
struct mmc_host;
struct sdio_func;
+struct sdio_func_tuple;
#define SDIO_MAX_FUNCS 7
@@ -98,7 +106,9 @@ struct mmc_card {
unsigned int sdio_funcs; /* number of SDIO functions */
struct sdio_cccr cccr; /* common card info */
+ struct sdio_cis cis; /* common tuple info */
struct sdio_func *sdio_func[SDIO_MAX_FUNCS]; /* SDIO functions (devices) */
+ struct sdio_func_tuple *tuples; /* unknown common tuples */
};
#define mmc_card_mmc(c) ((c)->type == MMC_TYPE_MMC)
diff --git a/include/linux/mmc/sdio_func.h b/include/linux/mmc/sdio_func.h
index 269067663c8d..2f2b3c854415 100644
--- a/include/linux/mmc/sdio_func.h
+++ b/include/linux/mmc/sdio_func.h
@@ -36,6 +36,8 @@ struct sdio_func {
unsigned short vendor; /* vendor id */
unsigned short device; /* device id */
+ unsigned short blksize; /* maximum block size */
+
unsigned int state; /* function state */
#define SDIO_STATE_PRESENT (1<<0) /* present in sysfs */