aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2010-07-11 03:51:14 -0400
committerDominik Brodowski <linux@dominikbrodowski.net>2010-07-30 15:07:26 -0400
commit5716d415f8c5a17d44f6e1d5a1e4998f7306a93b (patch)
tree81a946cccfd7ddb6f1b01839f68afa27fc42a180 /include
parentb37fa16e78d6f9790462b3181602a26b5af36260 (diff)
pcmcia: remove obsolete ioctl
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'include')
-rw-r--r--include/pcmcia/ds.h209
-rw-r--r--include/pcmcia/ss.h8
2 files changed, 1 insertions, 216 deletions
diff --git a/include/pcmcia/ds.h b/include/pcmcia/ds.h
index c180165fbd3e..7d7721e86032 100644
--- a/include/pcmcia/ds.h
+++ b/include/pcmcia/ds.h
@@ -117,11 +117,6 @@ struct pcmcia_device {
117 u64 dma_mask; 117 u64 dma_mask;
118 struct device dev; 118 struct device dev;
119 119
120#ifdef CONFIG_PCMCIA_IOCTL
121 /* device driver wanted by cardmgr */
122 struct pcmcia_driver *cardmgr;
123#endif
124
125 /* data private to drivers */ 120 /* data private to drivers */
126 void *priv; 121 void *priv;
127}; 122};
@@ -211,208 +206,4 @@ void pcmcia_disable_device(struct pcmcia_device *p_dev);
211 206
212#endif /* __KERNEL__ */ 207#endif /* __KERNEL__ */
213 208
214
215
216/* Below, there are only definitions which are used by
217 * - the PCMCIA ioctl
218 * - deprecated PCMCIA userspace tools only
219 *
220 * here be dragons ... here be dragons ... here be dragons ... here be drag
221 */
222
223#if defined(CONFIG_PCMCIA_IOCTL) || !defined(__KERNEL__)
224
225#if defined(__arm__) || defined(__mips__) || defined(__avr32__) || \
226 defined(__bfin__)
227/* This (ioaddr_t) is exposed to userspace & hence cannot be changed. */
228typedef u_int ioaddr_t;
229#else
230typedef u_short ioaddr_t;
231#endif
232
233/* for AdjustResourceInfo */
234typedef struct adjust_t {
235 u_int Action;
236 u_int Resource;
237 u_int Attributes;
238 union {
239 struct memory {
240 u_long Base;
241 u_long Size;
242 } memory;
243 struct io {
244 ioaddr_t BasePort;
245 ioaddr_t NumPorts;
246 u_int IOAddrLines;
247 } io;
248 struct irq {
249 u_int IRQ;
250 } irq;
251 } resource;
252} adjust_t;
253
254/* Action field */
255#define REMOVE_MANAGED_RESOURCE 1
256#define ADD_MANAGED_RESOURCE 2
257#define GET_FIRST_MANAGED_RESOURCE 3
258#define GET_NEXT_MANAGED_RESOURCE 4
259/* Resource field */
260#define RES_MEMORY_RANGE 1
261#define RES_IO_RANGE 2
262#define RES_IRQ 3
263/* Attribute field */
264#define RES_IRQ_TYPE 0x03
265#define RES_IRQ_TYPE_EXCLUSIVE 0
266#define RES_IRQ_TYPE_TIME 1
267#define RES_IRQ_TYPE_DYNAMIC 2
268#define RES_IRQ_CSC 0x04
269#define RES_SHARED 0x08
270#define RES_RESERVED 0x10
271#define RES_ALLOCATED 0x20
272#define RES_REMOVED 0x40
273
274
275typedef struct tuple_parse_t {
276 tuple_t tuple;
277 cisdata_t data[255];
278 cisparse_t parse;
279} tuple_parse_t;
280
281typedef struct win_info_t {
282 window_handle_t handle;
283 win_req_t window;
284 memreq_t map;
285} win_info_t;
286
287typedef struct bind_info_t {
288 dev_info_t dev_info;
289 u_char function;
290 struct pcmcia_device *instance;
291 char name[DEV_NAME_LEN];
292 u_short major, minor;
293 void *next;
294} bind_info_t;
295
296typedef struct mtd_info_t {
297 dev_info_t dev_info;
298 u_int Attributes;
299 u_int CardOffset;
300} mtd_info_t;
301
302typedef struct region_info_t {
303 u_int Attributes;
304 u_int CardOffset;
305 u_int RegionSize;
306 u_int AccessSpeed;
307 u_int BlockSize;
308 u_int PartMultiple;
309 u_char JedecMfr, JedecInfo;
310 memory_handle_t next;
311} region_info_t;
312
313#define REGION_TYPE 0x0001
314#define REGION_TYPE_CM 0x0000
315#define REGION_TYPE_AM 0x0001
316#define REGION_PREFETCH 0x0008
317#define REGION_CACHEABLE 0x0010
318#define REGION_BAR_MASK 0xe000
319#define REGION_BAR_SHIFT 13
320
321/* For ReplaceCIS */
322typedef struct cisdump_t {
323 u_int Length;
324 cisdata_t Data[CISTPL_MAX_CIS_SIZE];
325} cisdump_t;
326
327/* for GetConfigurationInfo */
328typedef struct config_info_t {
329 u_char Function;
330 u_int Attributes;
331 u_int Vcc, Vpp1, Vpp2;
332 u_int IntType;
333 u_int ConfigBase;
334 u_char Status, Pin, Copy, Option, ExtStatus;
335 u_int Present;
336 u_int CardValues;
337 u_int AssignedIRQ;
338 u_int IRQAttributes;
339 ioaddr_t BasePort1;
340 ioaddr_t NumPorts1;
341 u_int Attributes1;
342 ioaddr_t BasePort2;
343 ioaddr_t NumPorts2;
344 u_int Attributes2;
345 u_int IOAddrLines;
346} config_info_t;
347
348/* For ValidateCIS */
349typedef struct cisinfo_t {
350 u_int Chains;
351} cisinfo_t;
352
353typedef struct cs_status_t {
354 u_char Function;
355 event_t CardState;
356 event_t SocketState;
357} cs_status_t;
358
359typedef union ds_ioctl_arg_t {
360 adjust_t adjust;
361 config_info_t config;
362 tuple_t tuple;
363 tuple_parse_t tuple_parse;
364 client_req_t client_req;
365 cs_status_t status;
366 conf_reg_t conf_reg;
367 cisinfo_t cisinfo;
368 region_info_t region;
369 bind_info_t bind_info;
370 mtd_info_t mtd_info;
371 win_info_t win_info;
372 cisdump_t cisdump;
373} ds_ioctl_arg_t;
374
375#define DS_ADJUST_RESOURCE_INFO _IOWR('d', 2, adjust_t)
376#define DS_GET_CONFIGURATION_INFO _IOWR('d', 3, config_info_t)
377#define DS_GET_FIRST_TUPLE _IOWR('d', 4, tuple_t)
378#define DS_GET_NEXT_TUPLE _IOWR('d', 5, tuple_t)
379#define DS_GET_TUPLE_DATA _IOWR('d', 6, tuple_parse_t)
380#define DS_PARSE_TUPLE _IOWR('d', 7, tuple_parse_t)
381#define DS_RESET_CARD _IO ('d', 8)
382#define DS_GET_STATUS _IOWR('d', 9, cs_status_t)
383#define DS_ACCESS_CONFIGURATION_REGISTER _IOWR('d', 10, conf_reg_t)
384#define DS_VALIDATE_CIS _IOR ('d', 11, cisinfo_t)
385#define DS_SUSPEND_CARD _IO ('d', 12)
386#define DS_RESUME_CARD _IO ('d', 13)
387#define DS_EJECT_CARD _IO ('d', 14)
388#define DS_INSERT_CARD _IO ('d', 15)
389#define DS_GET_FIRST_REGION _IOWR('d', 16, region_info_t)
390#define DS_GET_NEXT_REGION _IOWR('d', 17, region_info_t)
391#define DS_REPLACE_CIS _IOWR('d', 18, cisdump_t)
392#define DS_GET_FIRST_WINDOW _IOR ('d', 19, win_info_t)
393#define DS_GET_NEXT_WINDOW _IOWR('d', 20, win_info_t)
394#define DS_GET_MEM_PAGE _IOWR('d', 21, win_info_t)
395
396#define DS_BIND_REQUEST _IOWR('d', 60, bind_info_t)
397#define DS_GET_DEVICE_INFO _IOWR('d', 61, bind_info_t)
398#define DS_GET_NEXT_DEVICE _IOWR('d', 62, bind_info_t)
399#define DS_UNBIND_REQUEST _IOW ('d', 63, bind_info_t)
400#define DS_BIND_MTD _IOWR('d', 64, mtd_info_t)
401
402
403/* used in userspace only */
404#define CS_IN_USE 0x1e
405
406#define INFO_MASTER_CLIENT 0x01
407#define INFO_IO_CLIENT 0x02
408#define INFO_MTD_CLIENT 0x04
409#define INFO_MEM_CLIENT 0x08
410#define MAX_NUM_CLIENTS 3
411
412#define INFO_CARD_SHARE 0x10
413#define INFO_CARD_EXCL 0x20
414
415
416#endif /* !defined(__KERNEL__) || defined(CONFIG_PCMCIA_IOCTL) */
417
418#endif /* _LINUX_DS_H */ 209#endif /* _LINUX_DS_H */
diff --git a/include/pcmcia/ss.h b/include/pcmcia/ss.h
index 764281b29218..66740b764da7 100644
--- a/include/pcmcia/ss.h
+++ b/include/pcmcia/ss.h
@@ -220,12 +220,10 @@ struct pcmcia_socket {
220 220
221 /* 16-bit state: */ 221 /* 16-bit state: */
222 struct { 222 struct {
223 /* "master" ioctl is used */
224 u8 busy:1;
225 /* the PCMCIA card consists of two pseudo devices */ 223 /* the PCMCIA card consists of two pseudo devices */
226 u8 has_pfc:1; 224 u8 has_pfc:1;
227 225
228 u8 reserved:6; 226 u8 reserved:7;
229 } pcmcia_state; 227 } pcmcia_state;
230 228
231 /* non-zero if PCMCIA card is present */ 229 /* non-zero if PCMCIA card is present */
@@ -234,10 +232,6 @@ struct pcmcia_socket {
234 /* IRQ to be used by PCMCIA devices. May not be IRQ 0. */ 232 /* IRQ to be used by PCMCIA devices. May not be IRQ 0. */
235 unsigned int pcmcia_irq; 233 unsigned int pcmcia_irq;
236 234
237#ifdef CONFIG_PCMCIA_IOCTL
238 struct user_info_t *user;
239 wait_queue_head_t queue;
240#endif /* CONFIG_PCMCIA_IOCTL */
241#endif /* CONFIG_PCMCIA */ 235#endif /* CONFIG_PCMCIA */
242 236
243 /* socket device */ 237 /* socket device */
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-10 14:59:50 -0500