aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia/cs_internal.h
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2010-01-06 07:57:43 -0500
committerDominik Brodowski <linux@dominikbrodowski.net>2010-02-17 11:37:30 -0500
commit6e7b51a733fde86d3be748543215a69da04d5bb7 (patch)
tree4c608cf607ef1bb69231f4c67d45a9ac9429e650 /drivers/pcmcia/cs_internal.h
parent4e8804ff6dd1a842d9531c819a0acc9eb3bcfa3b (diff)
pcmcia: move cistpl.c into pcmcia module
As PCMCIA is the only real user of CIS access functions, include cistpl.c in the PCMCIA module, not in the PCMCIA & CardBus core module. Tested-by: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/pcmcia/cs_internal.h')
-rw-r--r--drivers/pcmcia/cs_internal.h44
1 files changed, 21 insertions, 23 deletions
diff --git a/drivers/pcmcia/cs_internal.h b/drivers/pcmcia/cs_internal.h
index ad05e3b59473..3f438afdcd4e 100644
--- a/drivers/pcmcia/cs_internal.h
+++ b/drivers/pcmcia/cs_internal.h
@@ -92,9 +92,6 @@ struct pccard_resource_ops {
92 * Stuff internal to module "pcmcia_core": 92 * Stuff internal to module "pcmcia_core":
93 */ 93 */
94 94
95/* cistpl.c */
96int verify_cis_cache(struct pcmcia_socket *s);
97
98/* socket_sysfs.c */ 95/* socket_sysfs.c */
99extern int pccard_sysfs_add_socket(struct device *dev); 96extern int pccard_sysfs_add_socket(struct device *dev);
100extern void pccard_sysfs_remove_socket(struct device *dev); 97extern void pccard_sysfs_remove_socket(struct device *dev);
@@ -102,8 +99,6 @@ extern void pccard_sysfs_remove_socket(struct device *dev);
102/* cardbus.c */ 99/* cardbus.c */
103int cb_alloc(struct pcmcia_socket *s); 100int cb_alloc(struct pcmcia_socket *s);
104void cb_free(struct pcmcia_socket *s); 101void cb_free(struct pcmcia_socket *s);
105int read_cb_mem(struct pcmcia_socket *s, int space, u_int addr, u_int len,
106 void *ptr);
107 102
108 103
109 104
@@ -116,6 +111,7 @@ struct pcmcia_callback{
116 int (*event) (struct pcmcia_socket *s, 111 int (*event) (struct pcmcia_socket *s,
117 event_t event, int priority); 112 event_t event, int priority);
118 void (*requery) (struct pcmcia_socket *s, int new_cis); 113 void (*requery) (struct pcmcia_socket *s, int new_cis);
114 int (*validate) (struct pcmcia_socket *s, unsigned int *i);
119 int (*suspend) (struct pcmcia_socket *s); 115 int (*suspend) (struct pcmcia_socket *s);
120 int (*resume) (struct pcmcia_socket *s); 116 int (*resume) (struct pcmcia_socket *s);
121}; 117};
@@ -137,7 +133,26 @@ int pcmcia_insert_card(struct pcmcia_socket *skt);
137struct pcmcia_socket *pcmcia_get_socket(struct pcmcia_socket *skt); 133struct pcmcia_socket *pcmcia_get_socket(struct pcmcia_socket *skt);
138void pcmcia_put_socket(struct pcmcia_socket *skt); 134void pcmcia_put_socket(struct pcmcia_socket *skt);
139 135
136/* rsrc_mgr.c */
137int pcmcia_validate_mem(struct pcmcia_socket *s);
138struct resource *pcmcia_find_mem_region(u_long base,
139 u_long num,
140 u_long align,
141 int low,
142 struct pcmcia_socket *s);
143
144/*
145 * Stuff internal to module "pcmcia".
146 */
147/* ds.c */
148extern struct bus_type pcmcia_bus_type;
149
150/* pcmcia_resource.c */
151extern int pcmcia_release_configuration(struct pcmcia_device *p_dev);
152
140/* cistpl.c */ 153/* cistpl.c */
154extern struct bin_attribute pccard_cis_attr;
155
141int pcmcia_read_cis_mem(struct pcmcia_socket *s, int attr, 156int pcmcia_read_cis_mem(struct pcmcia_socket *s, int attr,
142 u_int addr, u_int len, void *ptr); 157 u_int addr, u_int len, void *ptr);
143void pcmcia_write_cis_mem(struct pcmcia_socket *s, int attr, 158void pcmcia_write_cis_mem(struct pcmcia_socket *s, int attr,
@@ -149,8 +164,8 @@ int pccard_read_tuple(struct pcmcia_socket *s, unsigned int function,
149int pcmcia_replace_cis(struct pcmcia_socket *s, 164int pcmcia_replace_cis(struct pcmcia_socket *s,
150 const u8 *data, const size_t len); 165 const u8 *data, const size_t len);
151int pccard_validate_cis(struct pcmcia_socket *s, unsigned int *count); 166int pccard_validate_cis(struct pcmcia_socket *s, unsigned int *count);
167int verify_cis_cache(struct pcmcia_socket *s);
152 168
153/* loop over CIS entries */
154int pccard_loop_tuple(struct pcmcia_socket *s, unsigned int function, 169int pccard_loop_tuple(struct pcmcia_socket *s, unsigned int function,
155 cisdata_t code, cisparse_t *parse, void *priv_data, 170 cisdata_t code, cisparse_t *parse, void *priv_data,
156 int (*loop_tuple) (tuple_t *tuple, 171 int (*loop_tuple) (tuple_t *tuple,
@@ -166,23 +181,6 @@ int pccard_get_next_tuple(struct pcmcia_socket *s, unsigned int function,
166int pccard_get_tuple_data(struct pcmcia_socket *s, tuple_t *tuple); 181int pccard_get_tuple_data(struct pcmcia_socket *s, tuple_t *tuple);
167 182
168 183
169/* rsrc_mgr.c */
170int pcmcia_validate_mem(struct pcmcia_socket *s);
171struct resource *pcmcia_find_mem_region(u_long base,
172 u_long num,
173 u_long align,
174 int low,
175 struct pcmcia_socket *s);
176
177/*
178 * Stuff internal to module "pcmcia".
179 */
180/* ds.c */
181extern struct bus_type pcmcia_bus_type;
182
183/* pcmcia_resource.c */
184extern int pcmcia_release_configuration(struct pcmcia_device *p_dev);
185
186#ifdef CONFIG_PCMCIA_IOCTL 184#ifdef CONFIG_PCMCIA_IOCTL
187/* ds.c */ 185/* ds.c */
188extern spinlock_t pcmcia_dev_list_lock; 186extern spinlock_t pcmcia_dev_list_lock;