aboutsummaryrefslogtreecommitdiffstats
path: root/include/pcmcia
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2008-08-31 15:55:58 +0200
committerDominik Brodowski <linux@dominikbrodowski.net>2008-08-31 15:55:58 +0200
commit272433e088f843dc4dd5a5ad38dd68b9a93dcebf (patch)
tree1d0a5563b7241f215fe0c472407beec3ee68b47a /include/pcmcia
parent2f3061eb1086f98990d6495b8c63a1b83f2f59aa (diff)
downloadmrst-s0i3-test-272433e088f843dc4dd5a5ad38dd68b9a93dcebf.tar.gz
mrst-s0i3-test-272433e088f843dc4dd5a5ad38dd68b9a93dcebf.tar.xz
mrst-s0i3-test-272433e088f843dc4dd5a5ad38dd68b9a93dcebf.zip
pcmcia: cistpl header cleanup
16-bit PCMCIA device handling function definitions are moved to ds.h. Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'include/pcmcia')
-rw-r--r--include/pcmcia/cistpl.h30
-rw-r--r--include/pcmcia/ds.h28
2 files changed, 28 insertions, 30 deletions
diff --git a/include/pcmcia/cistpl.h b/include/pcmcia/cistpl.h
index 353abe74be7..026323bc47a 100644
--- a/include/pcmcia/cistpl.h
+++ b/include/pcmcia/cistpl.h
@@ -580,34 +580,4 @@ typedef struct cisinfo_t {
#define CISTPL_MAX_CIS_SIZE 0x200
-#ifdef __KERNEL__
-struct pcmcia_socket;
-
-int pcmcia_parse_tuple(tuple_t *tuple, cisparse_t *parse);
-
-/* don't use outside of PCMCIA core yet */
-int pccard_get_next_tuple(struct pcmcia_socket *s, unsigned int func, tuple_t *tuple);
-int pccard_get_first_tuple(struct pcmcia_socket *s, unsigned int function, tuple_t *tuple);
-int pccard_get_tuple_data(struct pcmcia_socket *s, tuple_t *tuple);
-
-/* ... but use these wrappers instead */
-#define pcmcia_get_first_tuple(p_dev, tuple) \
- pccard_get_first_tuple(p_dev->socket, p_dev->func, tuple)
-
-#define pcmcia_get_next_tuple(p_dev, tuple) \
- pccard_get_next_tuple(p_dev->socket, p_dev->func, tuple)
-
-#define pcmcia_get_tuple_data(p_dev, tuple) \
- pccard_get_tuple_data(p_dev->socket, tuple)
-
-int pcmcia_loop_config(struct pcmcia_device *p_dev,
- int (*conf_check) (struct pcmcia_device *p_dev,
- cistpl_cftable_entry_t *cf,
- cistpl_cftable_entry_t *dflt,
- unsigned int vcc,
- void *priv_data),
- void *priv_data);
-
-#endif /* __KERNEL__ */
-
#endif /* LINUX_CISTPL_H */
diff --git a/include/pcmcia/ds.h b/include/pcmcia/ds.h
index 29e40323089..5fb61952bce 100644
--- a/include/pcmcia/ds.h
+++ b/include/pcmcia/ds.h
@@ -176,6 +176,34 @@ const char *pcmcia_error_ret(int ret);
pcmcia_error_ret(ret)); \
}
+/* CIS access.
+ * Use the pcmcia_* versions in PCMCIA drivers
+ */
+int pcmcia_parse_tuple(tuple_t *tuple, cisparse_t *parse);
+
+int pccard_get_first_tuple(struct pcmcia_socket *s, unsigned int function,
+ tuple_t *tuple);
+#define pcmcia_get_first_tuple(p_dev, tuple) \
+ pccard_get_first_tuple(p_dev->socket, p_dev->func, tuple)
+
+int pccard_get_next_tuple(struct pcmcia_socket *s, unsigned int function,
+ tuple_t *tuple);
+#define pcmcia_get_next_tuple(p_dev, tuple) \
+ pccard_get_next_tuple(p_dev->socket, p_dev->func, tuple)
+
+int pccard_get_tuple_data(struct pcmcia_socket *s, tuple_t *tuple);
+#define pcmcia_get_tuple_data(p_dev, tuple) \
+ pccard_get_tuple_data(p_dev->socket, tuple)
+
+
+/* loop CIS entries for valid configuration */
+int pcmcia_loop_config(struct pcmcia_device *p_dev,
+ int (*conf_check) (struct pcmcia_device *p_dev,
+ cistpl_cftable_entry_t *cf,
+ cistpl_cftable_entry_t *dflt,
+ unsigned int vcc,
+ void *priv_data),
+ void *priv_data);
/* is the device still there? */
struct pcmcia_device *pcmcia_dev_present(struct pcmcia_device *p_dev);