diff options
author | Alex Dubov <oakad@yahoo.com> | 2008-02-09 13:20:54 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-09 14:08:34 -0500 |
commit | baf8532a147d5b76681ce040e2c8f25a3f0e718d (patch) | |
tree | 69c228046709295c1152f2063321327789c3b9f4 /include/linux/tifm.h | |
parent | 941edd030b9725f9f85bd62dfdb68cde3a50fb66 (diff) |
memstick: initial commit for Sony MemoryStick support
Sony MemoryStick cards are used in many products manufactured by Sony.
They are available both as storage and as IO expansion cards. Currently,
only MemoryStick Pro storage cards are supported via TI FlashMedia
MemoryStick interface.
[mboton@gmail.com: biuld fix]
[akpm@linux-foundation.org: build fix]
Signed-off-by: Alex Dubov <oakad@yahoo.com>
Signed-off-by: Miguel Boton <mboton@gmail.co>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux/tifm.h')
-rw-r--r-- | include/linux/tifm.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/tifm.h b/include/linux/tifm.h index 2096b76d0cee..da76ed85f595 100644 --- a/include/linux/tifm.h +++ b/include/linux/tifm.h | |||
@@ -72,6 +72,7 @@ enum { | |||
72 | #define TIFM_FIFO_READY 0x00000001 | 72 | #define TIFM_FIFO_READY 0x00000001 |
73 | #define TIFM_FIFO_INT_SETALL 0x0000ffff | 73 | #define TIFM_FIFO_INT_SETALL 0x0000ffff |
74 | #define TIFM_FIFO_INTMASK 0x00000005 | 74 | #define TIFM_FIFO_INTMASK 0x00000005 |
75 | #define TIFM_FIFO_SIZE 0x00000200 | ||
75 | 76 | ||
76 | #define TIFM_DMA_RESET 0x00000002 | 77 | #define TIFM_DMA_RESET 0x00000002 |
77 | #define TIFM_DMA_TX 0x00008000 | 78 | #define TIFM_DMA_TX 0x00008000 |
@@ -124,6 +125,8 @@ struct tifm_adapter { | |||
124 | 125 | ||
125 | void (*eject)(struct tifm_adapter *fm, | 126 | void (*eject)(struct tifm_adapter *fm, |
126 | struct tifm_dev *sock); | 127 | struct tifm_dev *sock); |
128 | int (*has_ms_pif)(struct tifm_adapter *fm, | ||
129 | struct tifm_dev *sock); | ||
127 | 130 | ||
128 | struct tifm_dev *sockets[0]; | 131 | struct tifm_dev *sockets[0]; |
129 | }; | 132 | }; |
@@ -141,6 +144,7 @@ struct tifm_dev *tifm_alloc_device(struct tifm_adapter *fm, unsigned int id, | |||
141 | int tifm_register_driver(struct tifm_driver *drv); | 144 | int tifm_register_driver(struct tifm_driver *drv); |
142 | void tifm_unregister_driver(struct tifm_driver *drv); | 145 | void tifm_unregister_driver(struct tifm_driver *drv); |
143 | void tifm_eject(struct tifm_dev *sock); | 146 | void tifm_eject(struct tifm_dev *sock); |
147 | int tifm_has_ms_pif(struct tifm_dev *sock); | ||
144 | int tifm_map_sg(struct tifm_dev *sock, struct scatterlist *sg, int nents, | 148 | int tifm_map_sg(struct tifm_dev *sock, struct scatterlist *sg, int nents, |
145 | int direction); | 149 | int direction); |
146 | void tifm_unmap_sg(struct tifm_dev *sock, struct scatterlist *sg, int nents, | 150 | void tifm_unmap_sg(struct tifm_dev *sock, struct scatterlist *sg, int nents, |