sdio: store vendor strings

[linux-2.6-omap-h63xx.git] / include / linux / mmc / sdio_func.h

diff --git a/include/linux/mmc/sdio_func.h b/include/linux/mmc/sdio_func.h
index af813fffc4acd560ac35c81ba5e481718f674e68..b050f4d7b41f05af47bf98c342c0b4528d110e19 100644 (file)
--- a/include/linux/mmc/sdio_func.h
+++ b/include/linux/mmc/sdio_func.h
@@ -43,13 +43,17 @@ struct sdio_func {
        unsigned short          vendor;         /* vendor id */
        unsigned short          device;         /* device id */
 
-       unsigned short          blksize;        /* maximum block size */
+       unsigned                max_blksize;    /* maximum block size */
+       unsigned                cur_blksize;    /* current block size */
 
        unsigned int            state;          /* function state */
 #define SDIO_STATE_PRESENT     (1<<0)          /* present in sysfs */
 
        u8                      tmpbuf[4];      /* DMA:able scratch buffer */
 
+       unsigned                num_info;       /* number of info strings */
+       const char              **info;         /* info strings */
+
        struct sdio_func_tuple *tuples;
 };
 
@@ -111,6 +115,8 @@ extern void sdio_release_host(struct sdio_func *func);
 extern int sdio_enable_func(struct sdio_func *func);
 extern int sdio_disable_func(struct sdio_func *func);
 
+extern int sdio_set_block_size(struct sdio_func *func, unsigned blksz);
+
 extern int sdio_claim_irq(struct sdio_func *func, sdio_irq_handler_t *handler);
 extern int sdio_release_irq(struct sdio_func *func);
 
@@ -138,5 +144,10 @@ extern int sdio_memcpy_toio(struct sdio_func *func, unsigned int addr,
 extern int sdio_writesb(struct sdio_func *func, unsigned int addr,
        void *src, int count);
 
+extern unsigned char sdio_f0_readb(struct sdio_func *func,
+       unsigned int addr, int *err_ret);
+extern void sdio_f0_writeb(struct sdio_func *func, unsigned char b,
+       unsigned int addr, int *err_ret);
+
 #endif