aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-08-06 15:25:06 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-06 15:25:06 -0400
commit1685e633b396b0f3dabbc9fa5d65dfefe6435250 (patch)
treeee83e26e2468ca1518a1b065c690159e12c8def9 /include
parent1cfd2bda8c486ae0e7a8005354758ebb68172bca (diff)
parent127c03cdbad9bd5af5d7f33bd31a1015a90cb77f (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: pcmcia: avoid buffer overflow in pcmcia_setup_isa_irq pcmcia: do not request windows if you don't need to pcmcia: insert PCMCIA device resources into resource tree pcmcia: export resource information to sysfs pcmcia: use struct resource for PCMCIA devices, part 2 pcmcia: remove memreq_t pcmcia: move local definitions out of include/pcmcia/cs.h pcmcia: do not use io_req_t when calling pcmcia_request_io() pcmcia: do not use io_req_t after call to pcmcia_request_io() pcmcia: use struct resource for PCMCIA devices pcmcia: clean up cs.h pcmcia: use pcmica_{read,write}_config_byte pcmcia: remove cs_types.h pcmcia: remove unused flag, simplify headers pcmcia: remove obsolete CS_EVENT_ definitions pcmcia: split up central event handler pcmcia: simplify event callback pcmcia: remove obsolete ioctl Conflicts in: - drivers/staging/comedi/drivers/* - drivers/staging/wlags49_h2/wl_cs.c due to dev_info_t and whitespace changes
Diffstat (limited to 'include')
-rw-r--r--include/pcmcia/cistpl.h2
-rw-r--r--include/pcmcia/cs.h157
-rw-r--r--include/pcmcia/cs_types.h40
-rw-r--r--include/pcmcia/ds.h251
-rw-r--r--include/pcmcia/ss.h25
5 files changed, 55 insertions, 420 deletions
diff --git a/include/pcmcia/cistpl.h b/include/pcmcia/cistpl.h
index cfdd5af77dcc..1c5088c9f7bf 100644
--- a/include/pcmcia/cistpl.h
+++ b/include/pcmcia/cistpl.h
@@ -15,6 +15,8 @@
15#ifndef _LINUX_CISTPL_H 15#ifndef _LINUX_CISTPL_H
16#define _LINUX_CISTPL_H 16#define _LINUX_CISTPL_H
17 17
18typedef unsigned char cisdata_t;
19
18#define CISTPL_NULL 0x00 20#define CISTPL_NULL 0x00
19#define CISTPL_DEVICE 0x01 21#define CISTPL_DEVICE 0x01
20#define CISTPL_LONGLINK_CB 0x02 22#define CISTPL_LONGLINK_CB 0x02
diff --git a/include/pcmcia/cs.h b/include/pcmcia/cs.h
index 57d8d0393567..68d8bde7e8d6 100644
--- a/include/pcmcia/cs.h
+++ b/include/pcmcia/cs.h
@@ -19,44 +19,6 @@
19#include <linux/interrupt.h> 19#include <linux/interrupt.h>
20#endif 20#endif
21 21
22/* For AccessConfigurationRegister */
23typedef struct conf_reg_t {
24 u_char Function;
25 u_int Action;
26 off_t Offset;
27 u_int Value;
28} conf_reg_t;
29
30/* Actions */
31#define CS_READ 1
32#define CS_WRITE 2
33
34/* for AdjustResourceInfo */
35/* Action field */
36#define REMOVE_MANAGED_RESOURCE 1
37#define ADD_MANAGED_RESOURCE 2
38
39
40typedef struct event_callback_args_t {
41 struct pcmcia_device *client_handle;
42 void *client_data;
43} event_callback_args_t;
44
45/* For CardValues field */
46#define CV_OPTION_VALUE 0x01
47#define CV_STATUS_VALUE 0x02
48#define CV_PIN_REPLACEMENT 0x04
49#define CV_COPY_VALUE 0x08
50#define CV_EXT_STATUS 0x10
51
52/* For GetFirst/NextClient */
53typedef struct client_req_t {
54 socket_t Socket;
55 u_int Attributes;
56} client_req_t;
57
58#define CLIENT_THIS_SOCKET 0x01
59
60/* ModifyConfiguration */ 22/* ModifyConfiguration */
61typedef struct modconf_t { 23typedef struct modconf_t {
62 u_int Attributes; 24 u_int Attributes;
@@ -94,43 +56,6 @@ typedef struct config_req_t {
94#define INT_CARDBUS 0x04 56#define INT_CARDBUS 0x04
95#define INT_ZOOMED_VIDEO 0x08 57#define INT_ZOOMED_VIDEO 0x08
96 58
97/* For RequestIO and ReleaseIO */
98typedef struct io_req_t {
99 u_int BasePort1;
100 u_int NumPorts1;
101 u_int Attributes1;
102 u_int BasePort2;
103 u_int NumPorts2;
104 u_int Attributes2;
105 u_int IOAddrLines;
106} io_req_t;
107
108/* Attributes for RequestIO and ReleaseIO */
109#define IO_SHARED 0x01
110#define IO_FIRST_SHARED 0x02
111#define IO_FORCE_ALIAS_ACCESS 0x04
112#define IO_DATA_PATH_WIDTH 0x18
113#define IO_DATA_PATH_WIDTH_8 0x00
114#define IO_DATA_PATH_WIDTH_16 0x08
115#define IO_DATA_PATH_WIDTH_AUTO 0x10
116
117/* Bits in IRQInfo1 field */
118#define IRQ_NMI_ID 0x01
119#define IRQ_IOCK_ID 0x02
120#define IRQ_BERR_ID 0x04
121#define IRQ_VEND_ID 0x08
122#define IRQ_INFO2_VALID 0x10
123#define IRQ_LEVEL_ID 0x20
124#define IRQ_PULSE_ID 0x40
125#define IRQ_SHARE_ID 0x80
126
127typedef struct eventmask_t {
128 u_int Attributes;
129 u_int EventMask;
130} eventmask_t;
131
132#define CONF_EVENT_MASK_VALID 0x01
133
134/* Configuration registers present */ 59/* Configuration registers present */
135#define PRESENT_OPTION 0x001 60#define PRESENT_OPTION 0x001
136#define PRESENT_STATUS 0x002 61#define PRESENT_STATUS 0x002
@@ -143,18 +68,6 @@ typedef struct eventmask_t {
143#define PRESENT_IOBASE_3 0x100 68#define PRESENT_IOBASE_3 0x100
144#define PRESENT_IOSIZE 0x200 69#define PRESENT_IOSIZE 0x200
145 70
146/* For GetMemPage, MapMemPage */
147typedef struct memreq_t {
148 u_int CardOffset;
149 page_t Page;
150} memreq_t;
151
152/* For ModifyWindow */
153typedef struct modwin_t {
154 u_int Attributes;
155 u_int AccessSpeed;
156} modwin_t;
157
158/* For RequestWindow */ 71/* For RequestWindow */
159typedef struct win_req_t { 72typedef struct win_req_t {
160 u_int Attributes; 73 u_int Attributes;
@@ -164,61 +77,19 @@ typedef struct win_req_t {
164} win_req_t; 77} win_req_t;
165 78
166/* Attributes for RequestWindow */ 79/* Attributes for RequestWindow */
167#define WIN_ADDR_SPACE 0x0001 80#define WIN_MEMORY_TYPE_CM 0x00 /* default */
168#define WIN_ADDR_SPACE_MEM 0x0000 81#define WIN_MEMORY_TYPE_AM 0x20 /* MAP_ATTRIB */
169#define WIN_ADDR_SPACE_IO 0x0001 82#define WIN_DATA_WIDTH_8 0x00 /* default */
170#define WIN_MEMORY_TYPE 0x0002 83#define WIN_DATA_WIDTH_16 0x02 /* MAP_16BIT */
171#define WIN_MEMORY_TYPE_CM 0x0000 84#define WIN_ENABLE 0x01 /* MAP_ACTIVE */
172#define WIN_MEMORY_TYPE_AM 0x0002 85#define WIN_USE_WAIT 0x40 /* MAP_USE_WAIT */
173#define WIN_ENABLE 0x0004 86
174#define WIN_DATA_WIDTH 0x0018 87#define WIN_FLAGS_MAP 0x63 /* MAP_ATTRIB | MAP_16BIT | MAP_ACTIVE |
175#define WIN_DATA_WIDTH_8 0x0000 88 MAP_USE_WAIT */
176#define WIN_DATA_WIDTH_16 0x0008 89#define WIN_FLAGS_REQ 0x1c /* mapping to socket->win[i]:
177#define WIN_DATA_WIDTH_32 0x0010 90 0x04 -> 0
178#define WIN_PAGED 0x0020 91 0x08 -> 1
179#define WIN_SHARED 0x0040 92 0x0c -> 2
180#define WIN_FIRST_SHARED 0x0080 93 0x10 -> 3 */
181#define WIN_USE_WAIT 0x0100
182#define WIN_STRICT_ALIGN 0x0200
183#define WIN_MAP_BELOW_1MB 0x0400
184#define WIN_PREFETCH 0x0800
185#define WIN_CACHEABLE 0x1000
186#define WIN_BAR_MASK 0xe000
187#define WIN_BAR_SHIFT 13
188
189typedef struct error_info_t {
190 int func;
191 int retcode;
192} error_info_t;
193
194/* Flag to bind to all functions */
195#define BIND_FN_ALL 0xff
196
197/* Events */
198#define CS_EVENT_PRI_LOW 0
199#define CS_EVENT_PRI_HIGH 1
200
201#define CS_EVENT_WRITE_PROTECT 0x000001
202#define CS_EVENT_CARD_LOCK 0x000002
203#define CS_EVENT_CARD_INSERTION 0x000004
204#define CS_EVENT_CARD_REMOVAL 0x000008
205#define CS_EVENT_BATTERY_DEAD 0x000010
206#define CS_EVENT_BATTERY_LOW 0x000020
207#define CS_EVENT_READY_CHANGE 0x000040
208#define CS_EVENT_CARD_DETECT 0x000080
209#define CS_EVENT_RESET_REQUEST 0x000100
210#define CS_EVENT_RESET_PHYSICAL 0x000200
211#define CS_EVENT_CARD_RESET 0x000400
212#define CS_EVENT_REGISTRATION_COMPLETE 0x000800
213#define CS_EVENT_PM_SUSPEND 0x002000
214#define CS_EVENT_PM_RESUME 0x004000
215#define CS_EVENT_INSERTION_REQUEST 0x008000
216#define CS_EVENT_EJECTION_REQUEST 0x010000
217#define CS_EVENT_MTD_REQUEST 0x020000
218#define CS_EVENT_ERASE_COMPLETE 0x040000
219#define CS_EVENT_REQUEST_ATTENTION 0x080000
220#define CS_EVENT_CB_DETECT 0x100000
221#define CS_EVENT_3VCARD 0x200000
222#define CS_EVENT_XVCARD 0x400000
223 94
224#endif /* _LINUX_CS_H */ 95#endif /* _LINUX_CS_H */
diff --git a/include/pcmcia/cs_types.h b/include/pcmcia/cs_types.h
deleted file mode 100644
index f5e3b8386c8f..000000000000
--- a/include/pcmcia/cs_types.h
+++ /dev/null
@@ -1,40 +0,0 @@
1/*
2 * cs_types.h
3 *
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License version 2 as
6 * published by the Free Software Foundation.
7 *
8 * The initial developer of the original code is David A. Hinds
9 * <dahinds@users.sourceforge.net>. Portions created by David A. Hinds
10 * are Copyright (C) 1999 David A. Hinds. All Rights Reserved.
11 *
12 * (C) 1999 David A. Hinds
13 */
14
15#ifndef _LINUX_CS_TYPES_H
16#define _LINUX_CS_TYPES_H
17
18#ifdef __KERNEL__
19#include <linux/types.h>
20#else
21#include <sys/types.h>
22#endif
23
24typedef u_short socket_t;
25typedef u_int event_t;
26typedef u_char cisdata_t;
27typedef u_short page_t;
28
29typedef unsigned long window_handle_t;
30
31struct region_t;
32typedef struct region_t *memory_handle_t;
33
34#ifndef DEV_NAME_LEN
35#define DEV_NAME_LEN 32
36#endif
37
38typedef char dev_info_t[DEV_NAME_LEN];
39
40#endif /* _LINUX_CS_TYPES_H */
diff --git a/include/pcmcia/ds.h b/include/pcmcia/ds.h
index c180165fbd3e..70c58ed2278c 100644
--- a/include/pcmcia/ds.h
+++ b/include/pcmcia/ds.h
@@ -20,7 +20,6 @@
20#include <linux/mod_devicetable.h> 20#include <linux/mod_devicetable.h>
21#endif 21#endif
22 22
23#include <pcmcia/cs_types.h>
24#include <pcmcia/device_id.h> 23#include <pcmcia/device_id.h>
25 24
26#ifdef __KERNEL__ 25#ifdef __KERNEL__
@@ -37,6 +36,8 @@ struct pcmcia_device;
37struct config_t; 36struct config_t;
38struct net_device; 37struct net_device;
39 38
39typedef struct resource *window_handle_t;
40
40/* dynamic device IDs for PCMCIA device drivers. See 41/* dynamic device IDs for PCMCIA device drivers. See
41 * Documentation/pcmcia/driver.txt for details. 42 * Documentation/pcmcia/driver.txt for details.
42*/ 43*/
@@ -62,6 +63,17 @@ struct pcmcia_driver {
62int pcmcia_register_driver(struct pcmcia_driver *driver); 63int pcmcia_register_driver(struct pcmcia_driver *driver);
63void pcmcia_unregister_driver(struct pcmcia_driver *driver); 64void pcmcia_unregister_driver(struct pcmcia_driver *driver);
64 65
66/* for struct resource * array embedded in struct pcmcia_device */
67enum {
68 PCMCIA_IOPORT_0,
69 PCMCIA_IOPORT_1,
70 PCMCIA_IOMEM_0,
71 PCMCIA_IOMEM_1,
72 PCMCIA_IOMEM_2,
73 PCMCIA_IOMEM_3,
74 PCMCIA_NUM_RESOURCES,
75};
76
65struct pcmcia_device { 77struct pcmcia_device {
66 /* the socket and the device_no [for multifunction devices] 78 /* the socket and the device_no [for multifunction devices]
67 uniquely define a pcmcia_device */ 79 uniquely define a pcmcia_device */
@@ -79,13 +91,14 @@ struct pcmcia_device {
79 struct list_head socket_device_list; 91 struct list_head socket_device_list;
80 92
81 /* deprecated, will be cleaned up soon */ 93 /* deprecated, will be cleaned up soon */
82 u_int open;
83 io_req_t io;
84 config_req_t conf; 94 config_req_t conf;
85 window_handle_t win; 95 window_handle_t win;
86 96
87 /* device setup */ 97 /* device setup */
88 unsigned int irq; 98 unsigned int irq;
99 struct resource *resource[PCMCIA_NUM_RESOURCES];
100
101 unsigned int io_lines; /* number of I/O lines */
89 102
90 /* Is the device suspended? */ 103 /* Is the device suspended? */
91 u16 suspended:1; 104 u16 suspended:1;
@@ -117,13 +130,9 @@ struct pcmcia_device {
117 u64 dma_mask; 130 u64 dma_mask;
118 struct device dev; 131 struct device dev;
119 132
120#ifdef CONFIG_PCMCIA_IOCTL
121 /* device driver wanted by cardmgr */
122 struct pcmcia_driver *cardmgr;
123#endif
124
125 /* data private to drivers */ 133 /* data private to drivers */
126 void *priv; 134 void *priv;
135 unsigned int open;
127}; 136};
128 137
129#define to_pcmcia_dev(n) container_of(n, struct pcmcia_device, dev) 138#define to_pcmcia_dev(n) container_of(n, struct pcmcia_device, dev)
@@ -178,11 +187,11 @@ struct pcmcia_device *pcmcia_dev_present(struct pcmcia_device *p_dev);
178int pcmcia_reset_card(struct pcmcia_socket *skt); 187int pcmcia_reset_card(struct pcmcia_socket *skt);
179 188
180/* CIS config */ 189/* CIS config */
181int pcmcia_access_configuration_register(struct pcmcia_device *p_dev, 190int pcmcia_read_config_byte(struct pcmcia_device *p_dev, off_t where, u8 *val);
182 conf_reg_t *reg); 191int pcmcia_write_config_byte(struct pcmcia_device *p_dev, off_t where, u8 val);
183 192
184/* device configuration */ 193/* device configuration */
185int pcmcia_request_io(struct pcmcia_device *p_dev, io_req_t *req); 194int pcmcia_request_io(struct pcmcia_device *p_dev);
186 195
187int __must_check 196int __must_check
188__pcmcia_request_exclusive_irq(struct pcmcia_device *p_dev, 197__pcmcia_request_exclusive_irq(struct pcmcia_device *p_dev,
@@ -204,215 +213,27 @@ int pcmcia_request_window(struct pcmcia_device *p_dev, win_req_t *req,
204 window_handle_t *wh); 213 window_handle_t *wh);
205int pcmcia_release_window(struct pcmcia_device *p_dev, window_handle_t win); 214int pcmcia_release_window(struct pcmcia_device *p_dev, window_handle_t win);
206int pcmcia_map_mem_page(struct pcmcia_device *p_dev, window_handle_t win, 215int pcmcia_map_mem_page(struct pcmcia_device *p_dev, window_handle_t win,
207 memreq_t *req); 216 unsigned int offset);
208 217
209int pcmcia_modify_configuration(struct pcmcia_device *p_dev, modconf_t *mod); 218int pcmcia_modify_configuration(struct pcmcia_device *p_dev, modconf_t *mod);
210void pcmcia_disable_device(struct pcmcia_device *p_dev); 219void pcmcia_disable_device(struct pcmcia_device *p_dev);
211 220
212#endif /* __KERNEL__ */ 221/* IO ports */
213 222#define IO_DATA_PATH_WIDTH 0x18
214 223#define IO_DATA_PATH_WIDTH_8 0x00
224#define IO_DATA_PATH_WIDTH_16 0x08
225#define IO_DATA_PATH_WIDTH_AUTO 0x10
215 226
216/* Below, there are only definitions which are used by 227/* convert flag found in cfgtable to data path width parameter */
217 * - the PCMCIA ioctl 228static inline int pcmcia_io_cfg_data_width(unsigned int flags)
218 * - deprecated PCMCIA userspace tools only 229{
219 * 230 if (!(flags & CISTPL_IO_8BIT))
220 * here be dragons ... here be dragons ... here be dragons ... here be drag 231 return IO_DATA_PATH_WIDTH_16;
221 */ 232 if (!(flags & CISTPL_IO_16BIT))
222 233 return IO_DATA_PATH_WIDTH_8;
223#if defined(CONFIG_PCMCIA_IOCTL) || !defined(__KERNEL__) 234 return IO_DATA_PATH_WIDTH_AUTO;
224 235}
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 236
233/* for AdjustResourceInfo */ 237#endif /* __KERNEL__ */
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 238
418#endif /* _LINUX_DS_H */ 239#endif /* _LINUX_DS_H */
diff --git a/include/pcmcia/ss.h b/include/pcmcia/ss.h
index 764281b29218..626b63c33d9e 100644
--- a/include/pcmcia/ss.h
+++ b/include/pcmcia/ss.h
@@ -19,7 +19,6 @@
19#include <linux/sched.h> /* task_struct, completion */ 19#include <linux/sched.h> /* task_struct, completion */
20#include <linux/mutex.h> 20#include <linux/mutex.h>
21 21
22#include <pcmcia/cs_types.h>
23#include <pcmcia/cs.h> 22#include <pcmcia/cs.h>
24#ifdef CONFIG_CARDBUS 23#ifdef CONFIG_CARDBUS
25#include <linux/pci.h> 24#include <linux/pci.h>
@@ -162,17 +161,10 @@ struct pcmcia_socket {
162 u_int pci_irq; 161 u_int pci_irq;
163 struct pci_dev *cb_dev; 162 struct pci_dev *cb_dev;
164 163
165
166 /* socket setup is done so resources should be able to be allocated. 164 /* socket setup is done so resources should be able to be allocated.
167 * Only if set to 1, calls to find_{io,mem}_region are handled, and 165 * Only if set to 1, calls to find_{io,mem}_region are handled, and
168 * insertio events are actually managed by the PCMCIA layer.*/ 166 * insertio events are actually managed by the PCMCIA layer.*/
169 u8 resource_setup_done:1; 167 u8 resource_setup_done;
170
171 /* It's old if resource setup is done using adjust_resource_info() */
172 u8 resource_setup_old:1;
173 u8 resource_setup_new:1;
174
175 u8 reserved:5;
176 168
177 /* socket operations */ 169 /* socket operations */
178 struct pccard_operations *ops; 170 struct pccard_operations *ops;
@@ -218,15 +210,8 @@ struct pcmcia_socket {
218 * incorrectness and change */ 210 * incorrectness and change */
219 u8 device_count; 211 u8 device_count;
220 212
221 /* 16-bit state: */ 213 /* does the PCMCIA card consist of two pseudo devices? */
222 struct { 214 u8 pcmcia_pfc;
223 /* "master" ioctl is used */
224 u8 busy:1;
225 /* the PCMCIA card consists of two pseudo devices */
226 u8 has_pfc:1;
227
228 u8 reserved:6;
229 } pcmcia_state;
230 215
231 /* non-zero if PCMCIA card is present */ 216 /* non-zero if PCMCIA card is present */
232 atomic_t present; 217 atomic_t present;
@@ -234,10 +219,6 @@ struct pcmcia_socket {
234 /* IRQ to be used by PCMCIA devices. May not be IRQ 0. */ 219 /* IRQ to be used by PCMCIA devices. May not be IRQ 0. */
235 unsigned int pcmcia_irq; 220 unsigned int pcmcia_irq;
236 221
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 */ 222#endif /* CONFIG_PCMCIA */
242 223
243 /* socket device */ 224 /* socket device */
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-21 10:34:37 -0500