diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-13 17:12:40 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-13 17:12:40 -0400 |
commit | 2be4ff2f084842839b041b793ed6237e8d1d315a (patch) | |
tree | 1d776ac1717edeff4ee7d59ab0aea2782cb86dba /include | |
parent | cf2fa66055d718ae13e62451bb546505f63906a2 (diff) | |
parent | a45b3fb19ba1e4dfc3fc53563a072612092930a9 (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: (49 commits)
pcmcia: ioctl-internal definitions
pcmcia: cistpl header cleanup
pcmcia: remove unused argument to pcmcia_parse_tuple()
pcmcia: card services header cleanup
pcmcia: device_id header cleanup
pcmcia: encapsulate ioaddr_t
pcmcia: cleanup device driver header file
pcmcia: cleanup socket services header file
pcmcia: merge ds_internal.h into cs_internal.h
pcmcia: cleanup cs_internal.h
pcmcia: cs_internal.h is internal
pcmcia: use dev_printk for cs_error()
pcmcia: remove CS_ error codes alltogether
pcmcia: deprecate CS_BAD_TUPLE
pcmcia: deprecate CS_BAD_ARGS
pcmcia: deprecate CS_BAD_BASE, CS_BAD_IRQ, CS_BAD_OFFSET and CS_BAD_SIZE
pcmcia: deprecate CS_BAD_ATTRIBUTE, CS_BAD_TYPE and CS_BAD_PAGE
pcmcia: deprecate CS_NO_MORE_ITEMS
pcmcia: deprecate CS_IN_USE
pcmcia: deprecate CS_CONFIGURATION_LOCKED
...
Fix trivial conflict in drivers/pcmcia/ds.c manually
Diffstat (limited to 'include')
-rw-r--r-- | include/pcmcia/ciscode.h | 2 | ||||
-rw-r--r-- | include/pcmcia/cistpl.h | 38 | ||||
-rw-r--r-- | include/pcmcia/cs.h | 165 | ||||
-rw-r--r-- | include/pcmcia/cs_types.h | 8 | ||||
-rw-r--r-- | include/pcmcia/device_id.h | 18 | ||||
-rw-r--r-- | include/pcmcia/ds.h | 411 | ||||
-rw-r--r-- | include/pcmcia/ss.h | 202 |
7 files changed, 423 insertions, 421 deletions
diff --git a/include/pcmcia/ciscode.h b/include/pcmcia/ciscode.h index ad6e278ba7f2..b417985708f2 100644 --- a/include/pcmcia/ciscode.h +++ b/include/pcmcia/ciscode.h | |||
@@ -119,7 +119,7 @@ | |||
119 | 119 | ||
120 | #define MANFID_TOSHIBA 0x0098 | 120 | #define MANFID_TOSHIBA 0x0098 |
121 | 121 | ||
122 | #define MANFID_UNGERMANN 0x02c0 | 122 | #define MANFID_UNGERMANN 0x02c0 |
123 | 123 | ||
124 | #define MANFID_XIRCOM 0x0105 | 124 | #define MANFID_XIRCOM 0x0105 |
125 | 125 | ||
diff --git a/include/pcmcia/cistpl.h b/include/pcmcia/cistpl.h index e2e10c1e9a06..cfdd5af77dcc 100644 --- a/include/pcmcia/cistpl.h +++ b/include/pcmcia/cistpl.h | |||
@@ -573,44 +573,6 @@ typedef struct tuple_t { | |||
573 | #define TUPLE_RETURN_LINK 0x01 | 573 | #define TUPLE_RETURN_LINK 0x01 |
574 | #define TUPLE_RETURN_COMMON 0x02 | 574 | #define TUPLE_RETURN_COMMON 0x02 |
575 | 575 | ||
576 | /* For ValidateCIS */ | ||
577 | typedef struct cisinfo_t { | ||
578 | u_int Chains; | ||
579 | } cisinfo_t; | ||
580 | |||
581 | #define CISTPL_MAX_CIS_SIZE 0x200 | 576 | #define CISTPL_MAX_CIS_SIZE 0x200 |
582 | 577 | ||
583 | /* For ReplaceCIS */ | ||
584 | typedef struct cisdump_t { | ||
585 | u_int Length; | ||
586 | cisdata_t Data[CISTPL_MAX_CIS_SIZE]; | ||
587 | } cisdump_t; | ||
588 | |||
589 | |||
590 | int pcmcia_replace_cis(struct pcmcia_socket *s, cisdump_t *cis); | ||
591 | |||
592 | /* don't use outside of PCMCIA core yet */ | ||
593 | int pccard_get_next_tuple(struct pcmcia_socket *s, unsigned int func, tuple_t *tuple); | ||
594 | int pccard_get_first_tuple(struct pcmcia_socket *s, unsigned int function, tuple_t *tuple); | ||
595 | int pccard_get_tuple_data(struct pcmcia_socket *s, tuple_t *tuple); | ||
596 | int pccard_parse_tuple(tuple_t *tuple, cisparse_t *parse); | ||
597 | |||
598 | int pccard_validate_cis(struct pcmcia_socket *s, unsigned int function, unsigned int *count); | ||
599 | |||
600 | /* ... but use these wrappers instead */ | ||
601 | #define pcmcia_get_first_tuple(p_dev, tuple) \ | ||
602 | pccard_get_first_tuple(p_dev->socket, p_dev->func, tuple) | ||
603 | |||
604 | #define pcmcia_get_next_tuple(p_dev, tuple) \ | ||
605 | pccard_get_next_tuple(p_dev->socket, p_dev->func, tuple) | ||
606 | |||
607 | #define pcmcia_get_tuple_data(p_dev, tuple) \ | ||
608 | pccard_get_tuple_data(p_dev->socket, tuple) | ||
609 | |||
610 | #define pcmcia_parse_tuple(p_dev, tuple, parse) \ | ||
611 | pccard_parse_tuple(tuple, parse) | ||
612 | |||
613 | #define pcmcia_validate_cis(p_dev, info) \ | ||
614 | pccard_validate_cis(p_dev->socket, p_dev->func, info) | ||
615 | |||
616 | #endif /* LINUX_CISTPL_H */ | 578 | #endif /* LINUX_CISTPL_H */ |
diff --git a/include/pcmcia/cs.h b/include/pcmcia/cs.h index 45d84b275789..904468a191ef 100644 --- a/include/pcmcia/cs.h +++ b/include/pcmcia/cs.h | |||
@@ -28,72 +28,16 @@ typedef struct conf_reg_t { | |||
28 | #define CS_WRITE 2 | 28 | #define CS_WRITE 2 |
29 | 29 | ||
30 | /* for AdjustResourceInfo */ | 30 | /* for AdjustResourceInfo */ |
31 | typedef struct adjust_t { | ||
32 | u_int Action; | ||
33 | u_int Resource; | ||
34 | u_int Attributes; | ||
35 | union { | ||
36 | struct memory { | ||
37 | u_long Base; | ||
38 | u_long Size; | ||
39 | } memory; | ||
40 | struct io { | ||
41 | ioaddr_t BasePort; | ||
42 | ioaddr_t NumPorts; | ||
43 | u_int IOAddrLines; | ||
44 | } io; | ||
45 | struct irq { | ||
46 | u_int IRQ; | ||
47 | } irq; | ||
48 | } resource; | ||
49 | } adjust_t; | ||
50 | |||
51 | /* Action field */ | 31 | /* Action field */ |
52 | #define REMOVE_MANAGED_RESOURCE 1 | 32 | #define REMOVE_MANAGED_RESOURCE 1 |
53 | #define ADD_MANAGED_RESOURCE 2 | 33 | #define ADD_MANAGED_RESOURCE 2 |
54 | #define GET_FIRST_MANAGED_RESOURCE 3 | 34 | |
55 | #define GET_NEXT_MANAGED_RESOURCE 4 | ||
56 | /* Resource field */ | ||
57 | #define RES_MEMORY_RANGE 1 | ||
58 | #define RES_IO_RANGE 2 | ||
59 | #define RES_IRQ 3 | ||
60 | /* Attribute field */ | ||
61 | #define RES_IRQ_TYPE 0x03 | ||
62 | #define RES_IRQ_TYPE_EXCLUSIVE 0 | ||
63 | #define RES_IRQ_TYPE_TIME 1 | ||
64 | #define RES_IRQ_TYPE_DYNAMIC 2 | ||
65 | #define RES_IRQ_CSC 0x04 | ||
66 | #define RES_SHARED 0x08 | ||
67 | #define RES_RESERVED 0x10 | ||
68 | #define RES_ALLOCATED 0x20 | ||
69 | #define RES_REMOVED 0x40 | ||
70 | 35 | ||
71 | typedef struct event_callback_args_t { | 36 | typedef struct event_callback_args_t { |
72 | struct pcmcia_device *client_handle; | 37 | struct pcmcia_device *client_handle; |
73 | void *client_data; | 38 | void *client_data; |
74 | } event_callback_args_t; | 39 | } event_callback_args_t; |
75 | 40 | ||
76 | /* for GetConfigurationInfo */ | ||
77 | typedef struct config_info_t { | ||
78 | u_char Function; | ||
79 | u_int Attributes; | ||
80 | u_int Vcc, Vpp1, Vpp2; | ||
81 | u_int IntType; | ||
82 | u_int ConfigBase; | ||
83 | u_char Status, Pin, Copy, Option, ExtStatus; | ||
84 | u_int Present; | ||
85 | u_int CardValues; | ||
86 | u_int AssignedIRQ; | ||
87 | u_int IRQAttributes; | ||
88 | ioaddr_t BasePort1; | ||
89 | ioaddr_t NumPorts1; | ||
90 | u_int Attributes1; | ||
91 | ioaddr_t BasePort2; | ||
92 | ioaddr_t NumPorts2; | ||
93 | u_int Attributes2; | ||
94 | u_int IOAddrLines; | ||
95 | } config_info_t; | ||
96 | |||
97 | /* For CardValues field */ | 41 | /* For CardValues field */ |
98 | #define CV_OPTION_VALUE 0x01 | 42 | #define CV_OPTION_VALUE 0x01 |
99 | #define CV_STATUS_VALUE 0x02 | 43 | #define CV_STATUS_VALUE 0x02 |
@@ -257,22 +201,6 @@ typedef struct win_req_t { | |||
257 | #define WIN_BAR_MASK 0xe000 | 201 | #define WIN_BAR_MASK 0xe000 |
258 | #define WIN_BAR_SHIFT 13 | 202 | #define WIN_BAR_SHIFT 13 |
259 | 203 | ||
260 | /* Attributes for RegisterClient -- UNUSED -- */ | ||
261 | #define INFO_MASTER_CLIENT 0x01 | ||
262 | #define INFO_IO_CLIENT 0x02 | ||
263 | #define INFO_MTD_CLIENT 0x04 | ||
264 | #define INFO_MEM_CLIENT 0x08 | ||
265 | #define MAX_NUM_CLIENTS 3 | ||
266 | |||
267 | #define INFO_CARD_SHARE 0x10 | ||
268 | #define INFO_CARD_EXCL 0x20 | ||
269 | |||
270 | typedef struct cs_status_t { | ||
271 | u_char Function; | ||
272 | event_t CardState; | ||
273 | event_t SocketState; | ||
274 | } cs_status_t; | ||
275 | |||
276 | typedef struct error_info_t { | 204 | typedef struct error_info_t { |
277 | int func; | 205 | int func; |
278 | int retcode; | 206 | int retcode; |
@@ -308,95 +236,4 @@ typedef struct error_info_t { | |||
308 | #define CS_EVENT_3VCARD 0x200000 | 236 | #define CS_EVENT_3VCARD 0x200000 |
309 | #define CS_EVENT_XVCARD 0x400000 | 237 | #define CS_EVENT_XVCARD 0x400000 |
310 | 238 | ||
311 | /* Return codes */ | ||
312 | #define CS_SUCCESS 0x00 | ||
313 | #define CS_BAD_ADAPTER 0x01 | ||
314 | #define CS_BAD_ATTRIBUTE 0x02 | ||
315 | #define CS_BAD_BASE 0x03 | ||
316 | #define CS_BAD_EDC 0x04 | ||
317 | #define CS_BAD_IRQ 0x06 | ||
318 | #define CS_BAD_OFFSET 0x07 | ||
319 | #define CS_BAD_PAGE 0x08 | ||
320 | #define CS_READ_FAILURE 0x09 | ||
321 | #define CS_BAD_SIZE 0x0a | ||
322 | #define CS_BAD_SOCKET 0x0b | ||
323 | #define CS_BAD_TYPE 0x0d | ||
324 | #define CS_BAD_VCC 0x0e | ||
325 | #define CS_BAD_VPP 0x0f | ||
326 | #define CS_BAD_WINDOW 0x11 | ||
327 | #define CS_WRITE_FAILURE 0x12 | ||
328 | #define CS_NO_CARD 0x14 | ||
329 | #define CS_UNSUPPORTED_FUNCTION 0x15 | ||
330 | #define CS_UNSUPPORTED_MODE 0x16 | ||
331 | #define CS_BAD_SPEED 0x17 | ||
332 | #define CS_BUSY 0x18 | ||
333 | #define CS_GENERAL_FAILURE 0x19 | ||
334 | #define CS_WRITE_PROTECTED 0x1a | ||
335 | #define CS_BAD_ARG_LENGTH 0x1b | ||
336 | #define CS_BAD_ARGS 0x1c | ||
337 | #define CS_CONFIGURATION_LOCKED 0x1d | ||
338 | #define CS_IN_USE 0x1e | ||
339 | #define CS_NO_MORE_ITEMS 0x1f | ||
340 | #define CS_OUT_OF_RESOURCE 0x20 | ||
341 | #define CS_BAD_HANDLE 0x21 | ||
342 | |||
343 | #define CS_BAD_TUPLE 0x40 | ||
344 | |||
345 | #ifdef __KERNEL__ | ||
346 | |||
347 | /* | ||
348 | * The main Card Services entry point | ||
349 | */ | ||
350 | |||
351 | enum service { | ||
352 | AccessConfigurationRegister, AddSocketServices, | ||
353 | AdjustResourceInfo, CheckEraseQueue, CloseMemory, CopyMemory, | ||
354 | DeregisterClient, DeregisterEraseQueue, GetCardServicesInfo, | ||
355 | GetClientInfo, GetConfigurationInfo, GetEventMask, | ||
356 | GetFirstClient, GetFirstPartion, GetFirstRegion, GetFirstTuple, | ||
357 | GetNextClient, GetNextPartition, GetNextRegion, GetNextTuple, | ||
358 | GetStatus, GetTupleData, MapLogSocket, MapLogWindow, MapMemPage, | ||
359 | MapPhySocket, MapPhyWindow, ModifyConfiguration, ModifyWindow, | ||
360 | OpenMemory, ParseTuple, ReadMemory, RegisterClient, | ||
361 | RegisterEraseQueue, RegisterMTD, RegisterTimer, | ||
362 | ReleaseConfiguration, ReleaseExclusive, ReleaseIO, ReleaseIRQ, | ||
363 | ReleaseSocketMask, ReleaseWindow, ReplaceSocketServices, | ||
364 | RequestConfiguration, RequestExclusive, RequestIO, RequestIRQ, | ||
365 | RequestSocketMask, RequestWindow, ResetCard, ReturnSSEntry, | ||
366 | SetEventMask, SetRegion, ValidateCIS, VendorSpecific, | ||
367 | WriteMemory, BindDevice, BindMTD, ReportError, | ||
368 | SuspendCard, ResumeCard, EjectCard, InsertCard, ReplaceCIS, | ||
369 | GetFirstWindow, GetNextWindow, GetMemPage | ||
370 | }; | ||
371 | |||
372 | struct pcmcia_socket; | ||
373 | |||
374 | int pcmcia_access_configuration_register(struct pcmcia_device *p_dev, conf_reg_t *reg); | ||
375 | int pcmcia_get_configuration_info(struct pcmcia_device *p_dev, config_info_t *config); | ||
376 | int pcmcia_get_mem_page(window_handle_t win, memreq_t *req); | ||
377 | int pcmcia_map_mem_page(window_handle_t win, memreq_t *req); | ||
378 | int pcmcia_modify_configuration(struct pcmcia_device *p_dev, modconf_t *mod); | ||
379 | int pcmcia_release_window(window_handle_t win); | ||
380 | int pcmcia_request_configuration(struct pcmcia_device *p_dev, config_req_t *req); | ||
381 | int pcmcia_request_io(struct pcmcia_device *p_dev, io_req_t *req); | ||
382 | int pcmcia_request_irq(struct pcmcia_device *p_dev, irq_req_t *req); | ||
383 | int pcmcia_request_window(struct pcmcia_device **p_dev, win_req_t *req, window_handle_t *wh); | ||
384 | int pcmcia_suspend_card(struct pcmcia_socket *skt); | ||
385 | int pcmcia_resume_card(struct pcmcia_socket *skt); | ||
386 | int pcmcia_eject_card(struct pcmcia_socket *skt); | ||
387 | int pcmcia_insert_card(struct pcmcia_socket *skt); | ||
388 | int pccard_reset_card(struct pcmcia_socket *skt); | ||
389 | |||
390 | struct pcmcia_device * pcmcia_dev_present(struct pcmcia_device *p_dev); | ||
391 | void pcmcia_disable_device(struct pcmcia_device *p_dev); | ||
392 | |||
393 | struct pcmcia_socket * pcmcia_get_socket(struct pcmcia_socket *skt); | ||
394 | void pcmcia_put_socket(struct pcmcia_socket *skt); | ||
395 | |||
396 | /* compatibility functions */ | ||
397 | #define pcmcia_reset_card(p_dev, req) \ | ||
398 | pccard_reset_card(p_dev->socket) | ||
399 | |||
400 | #endif /* __KERNEL__ */ | ||
401 | |||
402 | #endif /* _LINUX_CS_H */ | 239 | #endif /* _LINUX_CS_H */ |
diff --git a/include/pcmcia/cs_types.h b/include/pcmcia/cs_types.h index f402a0f435b4..315965a37930 100644 --- a/include/pcmcia/cs_types.h +++ b/include/pcmcia/cs_types.h | |||
@@ -21,14 +21,6 @@ | |||
21 | #include <sys/types.h> | 21 | #include <sys/types.h> |
22 | #endif | 22 | #endif |
23 | 23 | ||
24 | #if defined(__arm__) || defined(__mips__) || defined(__avr32__) || \ | ||
25 | defined(__bfin__) | ||
26 | /* This (ioaddr_t) is exposed to userspace & hence cannot be changed. */ | ||
27 | typedef u_int ioaddr_t; | ||
28 | #else | ||
29 | typedef u_short ioaddr_t; | ||
30 | #endif | ||
31 | |||
32 | typedef u_short socket_t; | 24 | typedef u_short socket_t; |
33 | typedef u_int event_t; | 25 | typedef u_int event_t; |
34 | typedef u_char cisdata_t; | 26 | typedef u_char cisdata_t; |
diff --git a/include/pcmcia/device_id.h b/include/pcmcia/device_id.h index e04e0b0d9a25..c33ea08352b8 100644 --- a/include/pcmcia/device_id.h +++ b/include/pcmcia/device_id.h | |||
@@ -1,10 +1,19 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (2003-2004) Dominik Brodowski <linux@brodo.de> | 2 | * device_id.h -- PCMCIA driver matching helpers |
3 | * David Woodhouse | ||
4 | * | 3 | * |
5 | * License: GPL v2 | 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 | * (C) 2003 - 2004 David Woodhouse | ||
9 | * (C) 2003 - 2004 Dominik Brodowski | ||
6 | */ | 10 | */ |
7 | 11 | ||
12 | #ifndef _LINUX_PCMCIA_DEVICE_ID_H | ||
13 | #define _LINUX_PCMCIA_DEVICE_ID_H | ||
14 | |||
15 | #ifdef __KERNEL__ | ||
16 | |||
8 | #define PCMCIA_DEVICE_MANF_CARD(manf, card) { \ | 17 | #define PCMCIA_DEVICE_MANF_CARD(manf, card) { \ |
9 | .match_flags = PCMCIA_DEV_ID_MATCH_MANF_ID| \ | 18 | .match_flags = PCMCIA_DEV_ID_MATCH_MANF_ID| \ |
10 | PCMCIA_DEV_ID_MATCH_CARD_ID, \ | 19 | PCMCIA_DEV_ID_MATCH_CARD_ID, \ |
@@ -256,3 +265,6 @@ | |||
256 | 265 | ||
257 | 266 | ||
258 | #define PCMCIA_DEVICE_NULL { .match_flags = 0, } | 267 | #define PCMCIA_DEVICE_NULL { .match_flags = 0, } |
268 | |||
269 | #endif /* __KERNEL__ */ | ||
270 | #endif /* _LINUX_PCMCIA_DEVICE_ID_H */ | ||
diff --git a/include/pcmcia/ds.h b/include/pcmcia/ds.h index b316027c853d..a2be80b9a095 100644 --- a/include/pcmcia/ds.h +++ b/include/pcmcia/ds.h | |||
@@ -10,7 +10,7 @@ | |||
10 | * are Copyright (C) 1999 David A. Hinds. All Rights Reserved. | 10 | * are Copyright (C) 1999 David A. Hinds. All Rights Reserved. |
11 | * | 11 | * |
12 | * (C) 1999 David A. Hinds | 12 | * (C) 1999 David A. Hinds |
13 | * (C) 2003 - 2004 Dominik Brodowski | 13 | * (C) 2003 - 2008 Dominik Brodowski |
14 | */ | 14 | */ |
15 | 15 | ||
16 | #ifndef _LINUX_DS_H | 16 | #ifndef _LINUX_DS_H |
@@ -23,108 +23,21 @@ | |||
23 | #include <pcmcia/cs_types.h> | 23 | #include <pcmcia/cs_types.h> |
24 | #include <pcmcia/device_id.h> | 24 | #include <pcmcia/device_id.h> |
25 | 25 | ||
26 | typedef struct tuple_parse_t { | ||
27 | tuple_t tuple; | ||
28 | cisdata_t data[255]; | ||
29 | cisparse_t parse; | ||
30 | } tuple_parse_t; | ||
31 | |||
32 | typedef struct win_info_t { | ||
33 | window_handle_t handle; | ||
34 | win_req_t window; | ||
35 | memreq_t map; | ||
36 | } win_info_t; | ||
37 | |||
38 | typedef struct bind_info_t { | ||
39 | dev_info_t dev_info; | ||
40 | u_char function; | ||
41 | struct pcmcia_device *instance; | ||
42 | char name[DEV_NAME_LEN]; | ||
43 | u_short major, minor; | ||
44 | void *next; | ||
45 | } bind_info_t; | ||
46 | |||
47 | typedef struct mtd_info_t { | ||
48 | dev_info_t dev_info; | ||
49 | u_int Attributes; | ||
50 | u_int CardOffset; | ||
51 | } mtd_info_t; | ||
52 | |||
53 | typedef struct region_info_t { | ||
54 | u_int Attributes; | ||
55 | u_int CardOffset; | ||
56 | u_int RegionSize; | ||
57 | u_int AccessSpeed; | ||
58 | u_int BlockSize; | ||
59 | u_int PartMultiple; | ||
60 | u_char JedecMfr, JedecInfo; | ||
61 | memory_handle_t next; | ||
62 | } region_info_t; | ||
63 | #define REGION_TYPE 0x0001 | ||
64 | #define REGION_TYPE_CM 0x0000 | ||
65 | #define REGION_TYPE_AM 0x0001 | ||
66 | #define REGION_PREFETCH 0x0008 | ||
67 | #define REGION_CACHEABLE 0x0010 | ||
68 | #define REGION_BAR_MASK 0xe000 | ||
69 | #define REGION_BAR_SHIFT 13 | ||
70 | |||
71 | typedef union ds_ioctl_arg_t { | ||
72 | adjust_t adjust; | ||
73 | config_info_t config; | ||
74 | tuple_t tuple; | ||
75 | tuple_parse_t tuple_parse; | ||
76 | client_req_t client_req; | ||
77 | cs_status_t status; | ||
78 | conf_reg_t conf_reg; | ||
79 | cisinfo_t cisinfo; | ||
80 | region_info_t region; | ||
81 | bind_info_t bind_info; | ||
82 | mtd_info_t mtd_info; | ||
83 | win_info_t win_info; | ||
84 | cisdump_t cisdump; | ||
85 | } ds_ioctl_arg_t; | ||
86 | |||
87 | #define DS_ADJUST_RESOURCE_INFO _IOWR('d', 2, adjust_t) | ||
88 | #define DS_GET_CONFIGURATION_INFO _IOWR('d', 3, config_info_t) | ||
89 | #define DS_GET_FIRST_TUPLE _IOWR('d', 4, tuple_t) | ||
90 | #define DS_GET_NEXT_TUPLE _IOWR('d', 5, tuple_t) | ||
91 | #define DS_GET_TUPLE_DATA _IOWR('d', 6, tuple_parse_t) | ||
92 | #define DS_PARSE_TUPLE _IOWR('d', 7, tuple_parse_t) | ||
93 | #define DS_RESET_CARD _IO ('d', 8) | ||
94 | #define DS_GET_STATUS _IOWR('d', 9, cs_status_t) | ||
95 | #define DS_ACCESS_CONFIGURATION_REGISTER _IOWR('d', 10, conf_reg_t) | ||
96 | #define DS_VALIDATE_CIS _IOR ('d', 11, cisinfo_t) | ||
97 | #define DS_SUSPEND_CARD _IO ('d', 12) | ||
98 | #define DS_RESUME_CARD _IO ('d', 13) | ||
99 | #define DS_EJECT_CARD _IO ('d', 14) | ||
100 | #define DS_INSERT_CARD _IO ('d', 15) | ||
101 | #define DS_GET_FIRST_REGION _IOWR('d', 16, region_info_t) | ||
102 | #define DS_GET_NEXT_REGION _IOWR('d', 17, region_info_t) | ||
103 | #define DS_REPLACE_CIS _IOWR('d', 18, cisdump_t) | ||
104 | #define DS_GET_FIRST_WINDOW _IOR ('d', 19, win_info_t) | ||
105 | #define DS_GET_NEXT_WINDOW _IOWR('d', 20, win_info_t) | ||
106 | #define DS_GET_MEM_PAGE _IOWR('d', 21, win_info_t) | ||
107 | |||
108 | #define DS_BIND_REQUEST _IOWR('d', 60, bind_info_t) | ||
109 | #define DS_GET_DEVICE_INFO _IOWR('d', 61, bind_info_t) | ||
110 | #define DS_GET_NEXT_DEVICE _IOWR('d', 62, bind_info_t) | ||
111 | #define DS_UNBIND_REQUEST _IOW ('d', 63, bind_info_t) | ||
112 | #define DS_BIND_MTD _IOWR('d', 64, mtd_info_t) | ||
113 | |||
114 | #ifdef __KERNEL__ | 26 | #ifdef __KERNEL__ |
115 | #include <linux/device.h> | 27 | #include <linux/device.h> |
116 | #include <pcmcia/ss.h> | 28 | #include <pcmcia/ss.h> |
117 | 29 | ||
118 | typedef struct dev_node_t { | 30 | /* |
119 | char dev_name[DEV_NAME_LEN]; | 31 | * PCMCIA device drivers (16-bit cards only; 32-bit cards require CardBus |
120 | u_short major, minor; | 32 | * a.k.a. PCI drivers |
121 | struct dev_node_t *next; | 33 | */ |
122 | } dev_node_t; | ||
123 | |||
124 | |||
125 | struct pcmcia_socket; | 34 | struct pcmcia_socket; |
35 | struct pcmcia_device; | ||
126 | struct config_t; | 36 | struct config_t; |
127 | 37 | ||
38 | /* dynamic device IDs for PCMCIA device drivers. See | ||
39 | * Documentation/pcmcia/driver.txt for details. | ||
40 | */ | ||
128 | struct pcmcia_dynids { | 41 | struct pcmcia_dynids { |
129 | spinlock_t lock; | 42 | spinlock_t lock; |
130 | struct list_head list; | 43 | struct list_head list; |
@@ -147,6 +60,14 @@ struct pcmcia_driver { | |||
147 | int pcmcia_register_driver(struct pcmcia_driver *driver); | 60 | int pcmcia_register_driver(struct pcmcia_driver *driver); |
148 | void pcmcia_unregister_driver(struct pcmcia_driver *driver); | 61 | void pcmcia_unregister_driver(struct pcmcia_driver *driver); |
149 | 62 | ||
63 | /* Some drivers use dev_node_t to store char or block device information. | ||
64 | * Don't use this in new drivers, though. | ||
65 | */ | ||
66 | typedef struct dev_node_t { | ||
67 | char dev_name[DEV_NAME_LEN]; | ||
68 | u_short major, minor; | ||
69 | struct dev_node_t *next; | ||
70 | } dev_node_t; | ||
150 | 71 | ||
151 | struct pcmcia_device { | 72 | struct pcmcia_device { |
152 | /* the socket and the device_no [for multifunction devices] | 73 | /* the socket and the device_no [for multifunction devices] |
@@ -216,10 +137,304 @@ struct pcmcia_device { | |||
216 | #define to_pcmcia_dev(n) container_of(n, struct pcmcia_device, dev) | 137 | #define to_pcmcia_dev(n) container_of(n, struct pcmcia_device, dev) |
217 | #define to_pcmcia_drv(n) container_of(n, struct pcmcia_driver, drv) | 138 | #define to_pcmcia_drv(n) container_of(n, struct pcmcia_driver, drv) |
218 | 139 | ||
140 | /* deprecated -- don't use! */ | ||
219 | #define handle_to_dev(handle) (handle->dev) | 141 | #define handle_to_dev(handle) (handle->dev) |
220 | 142 | ||
221 | /* error reporting */ | 143 | |
222 | void cs_error(struct pcmcia_device *handle, int func, int ret); | 144 | /* (deprecated) error reporting by PCMCIA devices. Use dev_printk() |
145 | * or dev_dbg() directly in the driver, without referring to pcmcia_error_func() | ||
146 | * and/or pcmcia_error_ret() for those functions will go away soon. | ||
147 | */ | ||
148 | enum service { | ||
149 | AccessConfigurationRegister, AddSocketServices, | ||
150 | AdjustResourceInfo, CheckEraseQueue, CloseMemory, CopyMemory, | ||
151 | DeregisterClient, DeregisterEraseQueue, GetCardServicesInfo, | ||
152 | GetClientInfo, GetConfigurationInfo, GetEventMask, | ||
153 | GetFirstClient, GetFirstPartion, GetFirstRegion, GetFirstTuple, | ||
154 | GetNextClient, GetNextPartition, GetNextRegion, GetNextTuple, | ||
155 | GetStatus, GetTupleData, MapLogSocket, MapLogWindow, MapMemPage, | ||
156 | MapPhySocket, MapPhyWindow, ModifyConfiguration, ModifyWindow, | ||
157 | OpenMemory, ParseTuple, ReadMemory, RegisterClient, | ||
158 | RegisterEraseQueue, RegisterMTD, RegisterTimer, | ||
159 | ReleaseConfiguration, ReleaseExclusive, ReleaseIO, ReleaseIRQ, | ||
160 | ReleaseSocketMask, ReleaseWindow, ReplaceSocketServices, | ||
161 | RequestConfiguration, RequestExclusive, RequestIO, RequestIRQ, | ||
162 | RequestSocketMask, RequestWindow, ResetCard, ReturnSSEntry, | ||
163 | SetEventMask, SetRegion, ValidateCIS, VendorSpecific, | ||
164 | WriteMemory, BindDevice, BindMTD, ReportError, | ||
165 | SuspendCard, ResumeCard, EjectCard, InsertCard, ReplaceCIS, | ||
166 | GetFirstWindow, GetNextWindow, GetMemPage | ||
167 | }; | ||
168 | const char *pcmcia_error_func(int func); | ||
169 | const char *pcmcia_error_ret(int ret); | ||
170 | |||
171 | #define cs_error(p_dev, func, ret) \ | ||
172 | { \ | ||
173 | dev_printk(KERN_NOTICE, &p_dev->dev, \ | ||
174 | "%s : %s\n", \ | ||
175 | pcmcia_error_func(func), \ | ||
176 | pcmcia_error_ret(ret)); \ | ||
177 | } | ||
178 | |||
179 | /* CIS access. | ||
180 | * Use the pcmcia_* versions in PCMCIA drivers | ||
181 | */ | ||
182 | int pcmcia_parse_tuple(tuple_t *tuple, cisparse_t *parse); | ||
183 | |||
184 | int pccard_get_first_tuple(struct pcmcia_socket *s, unsigned int function, | ||
185 | tuple_t *tuple); | ||
186 | #define pcmcia_get_first_tuple(p_dev, tuple) \ | ||
187 | pccard_get_first_tuple(p_dev->socket, p_dev->func, tuple) | ||
188 | |||
189 | int pccard_get_next_tuple(struct pcmcia_socket *s, unsigned int function, | ||
190 | tuple_t *tuple); | ||
191 | #define pcmcia_get_next_tuple(p_dev, tuple) \ | ||
192 | pccard_get_next_tuple(p_dev->socket, p_dev->func, tuple) | ||
193 | |||
194 | int pccard_get_tuple_data(struct pcmcia_socket *s, tuple_t *tuple); | ||
195 | #define pcmcia_get_tuple_data(p_dev, tuple) \ | ||
196 | pccard_get_tuple_data(p_dev->socket, tuple) | ||
197 | |||
198 | |||
199 | /* loop CIS entries for valid configuration */ | ||
200 | int pcmcia_loop_config(struct pcmcia_device *p_dev, | ||
201 | int (*conf_check) (struct pcmcia_device *p_dev, | ||
202 | cistpl_cftable_entry_t *cf, | ||
203 | cistpl_cftable_entry_t *dflt, | ||
204 | unsigned int vcc, | ||
205 | void *priv_data), | ||
206 | void *priv_data); | ||
207 | |||
208 | /* is the device still there? */ | ||
209 | struct pcmcia_device *pcmcia_dev_present(struct pcmcia_device *p_dev); | ||
210 | |||
211 | /* low-level interface reset */ | ||
212 | int pcmcia_reset_card(struct pcmcia_socket *skt); | ||
213 | |||
214 | /* CIS config */ | ||
215 | int pcmcia_access_configuration_register(struct pcmcia_device *p_dev, | ||
216 | conf_reg_t *reg); | ||
217 | |||
218 | /* device configuration */ | ||
219 | int pcmcia_request_io(struct pcmcia_device *p_dev, io_req_t *req); | ||
220 | int pcmcia_request_irq(struct pcmcia_device *p_dev, irq_req_t *req); | ||
221 | int pcmcia_request_configuration(struct pcmcia_device *p_dev, | ||
222 | config_req_t *req); | ||
223 | |||
224 | int pcmcia_request_window(struct pcmcia_device **p_dev, win_req_t *req, | ||
225 | window_handle_t *wh); | ||
226 | int pcmcia_release_window(window_handle_t win); | ||
227 | |||
228 | int pcmcia_get_mem_page(window_handle_t win, memreq_t *req); | ||
229 | int pcmcia_map_mem_page(window_handle_t win, memreq_t *req); | ||
230 | |||
231 | int pcmcia_modify_configuration(struct pcmcia_device *p_dev, modconf_t *mod); | ||
232 | void pcmcia_disable_device(struct pcmcia_device *p_dev); | ||
223 | 233 | ||
224 | #endif /* __KERNEL__ */ | 234 | #endif /* __KERNEL__ */ |
235 | |||
236 | |||
237 | |||
238 | /* Below, there are only definitions which are used by | ||
239 | * - the PCMCIA ioctl | ||
240 | * - deprecated PCMCIA userspace tools only | ||
241 | * | ||
242 | * here be dragons ... here be dragons ... here be dragons ... here be drag | ||
243 | */ | ||
244 | |||
245 | #if defined(CONFIG_PCMCIA_IOCTL) || !defined(__KERNEL__) | ||
246 | |||
247 | #if defined(__arm__) || defined(__mips__) || defined(__avr32__) || \ | ||
248 | defined(__bfin__) | ||
249 | /* This (ioaddr_t) is exposed to userspace & hence cannot be changed. */ | ||
250 | typedef u_int ioaddr_t; | ||
251 | #else | ||
252 | typedef u_short ioaddr_t; | ||
253 | #endif | ||
254 | |||
255 | /* for AdjustResourceInfo */ | ||
256 | typedef struct adjust_t { | ||
257 | u_int Action; | ||
258 | u_int Resource; | ||
259 | u_int Attributes; | ||
260 | union { | ||
261 | struct memory { | ||
262 | u_long Base; | ||
263 | u_long Size; | ||
264 | } memory; | ||
265 | struct io { | ||
266 | ioaddr_t BasePort; | ||
267 | ioaddr_t NumPorts; | ||
268 | u_int IOAddrLines; | ||
269 | } io; | ||
270 | struct irq { | ||
271 | u_int IRQ; | ||
272 | } irq; | ||
273 | } resource; | ||
274 | } adjust_t; | ||
275 | |||
276 | /* Action field */ | ||
277 | #define REMOVE_MANAGED_RESOURCE 1 | ||
278 | #define ADD_MANAGED_RESOURCE 2 | ||
279 | #define GET_FIRST_MANAGED_RESOURCE 3 | ||
280 | #define GET_NEXT_MANAGED_RESOURCE 4 | ||
281 | /* Resource field */ | ||
282 | #define RES_MEMORY_RANGE 1 | ||
283 | #define RES_IO_RANGE 2 | ||
284 | #define RES_IRQ 3 | ||
285 | /* Attribute field */ | ||
286 | #define RES_IRQ_TYPE 0x03 | ||
287 | #define RES_IRQ_TYPE_EXCLUSIVE 0 | ||
288 | #define RES_IRQ_TYPE_TIME 1 | ||
289 | #define RES_IRQ_TYPE_DYNAMIC 2 | ||
290 | #define RES_IRQ_CSC 0x04 | ||
291 | #define RES_SHARED 0x08 | ||
292 | #define RES_RESERVED 0x10 | ||
293 | #define RES_ALLOCATED 0x20 | ||
294 | #define RES_REMOVED 0x40 | ||
295 | |||
296 | |||
297 | typedef struct tuple_parse_t { | ||
298 | tuple_t tuple; | ||
299 | cisdata_t data[255]; | ||
300 | cisparse_t parse; | ||
301 | } tuple_parse_t; | ||
302 | |||
303 | typedef struct win_info_t { | ||
304 | window_handle_t handle; | ||
305 | win_req_t window; | ||
306 | memreq_t map; | ||
307 | } win_info_t; | ||
308 | |||
309 | typedef struct bind_info_t { | ||
310 | dev_info_t dev_info; | ||
311 | u_char function; | ||
312 | struct pcmcia_device *instance; | ||
313 | char name[DEV_NAME_LEN]; | ||
314 | u_short major, minor; | ||
315 | void *next; | ||
316 | } bind_info_t; | ||
317 | |||
318 | typedef struct mtd_info_t { | ||
319 | dev_info_t dev_info; | ||
320 | u_int Attributes; | ||
321 | u_int CardOffset; | ||
322 | } mtd_info_t; | ||
323 | |||
324 | typedef struct region_info_t { | ||
325 | u_int Attributes; | ||
326 | u_int CardOffset; | ||
327 | u_int RegionSize; | ||
328 | u_int AccessSpeed; | ||
329 | u_int BlockSize; | ||
330 | u_int PartMultiple; | ||
331 | u_char JedecMfr, JedecInfo; | ||
332 | memory_handle_t next; | ||
333 | } region_info_t; | ||
334 | |||
335 | #define REGION_TYPE 0x0001 | ||
336 | #define REGION_TYPE_CM 0x0000 | ||
337 | #define REGION_TYPE_AM 0x0001 | ||
338 | #define REGION_PREFETCH 0x0008 | ||
339 | #define REGION_CACHEABLE 0x0010 | ||
340 | #define REGION_BAR_MASK 0xe000 | ||
341 | #define REGION_BAR_SHIFT 13 | ||
342 | |||
343 | /* For ReplaceCIS */ | ||
344 | typedef struct cisdump_t { | ||
345 | u_int Length; | ||
346 | cisdata_t Data[CISTPL_MAX_CIS_SIZE]; | ||
347 | } cisdump_t; | ||
348 | |||
349 | /* for GetConfigurationInfo */ | ||
350 | typedef struct config_info_t { | ||
351 | u_char Function; | ||
352 | u_int Attributes; | ||
353 | u_int Vcc, Vpp1, Vpp2; | ||
354 | u_int IntType; | ||
355 | u_int ConfigBase; | ||
356 | u_char Status, Pin, Copy, Option, ExtStatus; | ||
357 | u_int Present; | ||
358 | u_int CardValues; | ||
359 | u_int AssignedIRQ; | ||
360 | u_int IRQAttributes; | ||
361 | ioaddr_t BasePort1; | ||
362 | ioaddr_t NumPorts1; | ||
363 | u_int Attributes1; | ||
364 | ioaddr_t BasePort2; | ||
365 | ioaddr_t NumPorts2; | ||
366 | u_int Attributes2; | ||
367 | u_int IOAddrLines; | ||
368 | } config_info_t; | ||
369 | |||
370 | /* For ValidateCIS */ | ||
371 | typedef struct cisinfo_t { | ||
372 | u_int Chains; | ||
373 | } cisinfo_t; | ||
374 | |||
375 | typedef struct cs_status_t { | ||
376 | u_char Function; | ||
377 | event_t CardState; | ||
378 | event_t SocketState; | ||
379 | } cs_status_t; | ||
380 | |||
381 | typedef union ds_ioctl_arg_t { | ||
382 | adjust_t adjust; | ||
383 | config_info_t config; | ||
384 | tuple_t tuple; | ||
385 | tuple_parse_t tuple_parse; | ||
386 | client_req_t client_req; | ||
387 | cs_status_t status; | ||
388 | conf_reg_t conf_reg; | ||
389 | cisinfo_t cisinfo; | ||
390 | region_info_t region; | ||
391 | bind_info_t bind_info; | ||
392 | mtd_info_t mtd_info; | ||
393 | win_info_t win_info; | ||
394 | cisdump_t cisdump; | ||
395 | } ds_ioctl_arg_t; | ||
396 | |||
397 | #define DS_ADJUST_RESOURCE_INFO _IOWR('d', 2, adjust_t) | ||
398 | #define DS_GET_CONFIGURATION_INFO _IOWR('d', 3, config_info_t) | ||
399 | #define DS_GET_FIRST_TUPLE _IOWR('d', 4, tuple_t) | ||
400 | #define DS_GET_NEXT_TUPLE _IOWR('d', 5, tuple_t) | ||
401 | #define DS_GET_TUPLE_DATA _IOWR('d', 6, tuple_parse_t) | ||
402 | #define DS_PARSE_TUPLE _IOWR('d', 7, tuple_parse_t) | ||
403 | #define DS_RESET_CARD _IO ('d', 8) | ||
404 | #define DS_GET_STATUS _IOWR('d', 9, cs_status_t) | ||
405 | #define DS_ACCESS_CONFIGURATION_REGISTER _IOWR('d', 10, conf_reg_t) | ||
406 | #define DS_VALIDATE_CIS _IOR ('d', 11, cisinfo_t) | ||
407 | #define DS_SUSPEND_CARD _IO ('d', 12) | ||
408 | #define DS_RESUME_CARD _IO ('d', 13) | ||
409 | #define DS_EJECT_CARD _IO ('d', 14) | ||
410 | #define DS_INSERT_CARD _IO ('d', 15) | ||
411 | #define DS_GET_FIRST_REGION _IOWR('d', 16, region_info_t) | ||
412 | #define DS_GET_NEXT_REGION _IOWR('d', 17, region_info_t) | ||
413 | #define DS_REPLACE_CIS _IOWR('d', 18, cisdump_t) | ||
414 | #define DS_GET_FIRST_WINDOW _IOR ('d', 19, win_info_t) | ||
415 | #define DS_GET_NEXT_WINDOW _IOWR('d', 20, win_info_t) | ||
416 | #define DS_GET_MEM_PAGE _IOWR('d', 21, win_info_t) | ||
417 | |||
418 | #define DS_BIND_REQUEST _IOWR('d', 60, bind_info_t) | ||
419 | #define DS_GET_DEVICE_INFO _IOWR('d', 61, bind_info_t) | ||
420 | #define DS_GET_NEXT_DEVICE _IOWR('d', 62, bind_info_t) | ||
421 | #define DS_UNBIND_REQUEST _IOW ('d', 63, bind_info_t) | ||
422 | #define DS_BIND_MTD _IOWR('d', 64, mtd_info_t) | ||
423 | |||
424 | |||
425 | /* used in userspace only */ | ||
426 | #define CS_IN_USE 0x1e | ||
427 | |||
428 | #define INFO_MASTER_CLIENT 0x01 | ||
429 | #define INFO_IO_CLIENT 0x02 | ||
430 | #define INFO_MTD_CLIENT 0x04 | ||
431 | #define INFO_MEM_CLIENT 0x08 | ||
432 | #define MAX_NUM_CLIENTS 3 | ||
433 | |||
434 | #define INFO_CARD_SHARE 0x10 | ||
435 | #define INFO_CARD_EXCL 0x20 | ||
436 | |||
437 | |||
438 | #endif /* !defined(__KERNEL__) || defined(CONFIG_PCMCIA_IOCTL) */ | ||
439 | |||
225 | #endif /* _LINUX_DS_H */ | 440 | #endif /* _LINUX_DS_H */ |
diff --git a/include/pcmcia/ss.h b/include/pcmcia/ss.h index ed919dd9bb5c..9b4ac9385f5d 100644 --- a/include/pcmcia/ss.h +++ b/include/pcmcia/ss.h | |||
@@ -53,10 +53,10 @@ | |||
53 | 53 | ||
54 | /* for GetSocket, SetSocket */ | 54 | /* for GetSocket, SetSocket */ |
55 | typedef struct socket_state_t { | 55 | typedef struct socket_state_t { |
56 | u_int flags; | 56 | u_int flags; |
57 | u_int csc_mask; | 57 | u_int csc_mask; |
58 | u_char Vcc, Vpp; | 58 | u_char Vcc, Vpp; |
59 | u_char io_irq; | 59 | u_char io_irq; |
60 | } socket_state_t; | 60 | } socket_state_t; |
61 | 61 | ||
62 | extern socket_state_t dead_socket; | 62 | extern socket_state_t dead_socket; |
@@ -86,79 +86,22 @@ extern socket_state_t dead_socket; | |||
86 | #define HOOK_POWER_PRE 0x01 | 86 | #define HOOK_POWER_PRE 0x01 |
87 | #define HOOK_POWER_POST 0x02 | 87 | #define HOOK_POWER_POST 0x02 |
88 | 88 | ||
89 | |||
90 | typedef struct pccard_io_map { | 89 | typedef struct pccard_io_map { |
91 | u_char map; | 90 | u_char map; |
92 | u_char flags; | 91 | u_char flags; |
93 | u_short speed; | 92 | u_short speed; |
94 | u_int start, stop; | 93 | u_int start, stop; |
95 | } pccard_io_map; | 94 | } pccard_io_map; |
96 | 95 | ||
97 | typedef struct pccard_mem_map { | 96 | typedef struct pccard_mem_map { |
98 | u_char map; | 97 | u_char map; |
99 | u_char flags; | 98 | u_char flags; |
100 | u_short speed; | 99 | u_short speed; |
101 | u_long static_start; | 100 | u_long static_start; |
102 | u_int card_start; | 101 | u_int card_start; |
103 | struct resource *res; | 102 | struct resource *res; |
104 | } pccard_mem_map; | 103 | } pccard_mem_map; |
105 | 104 | ||
106 | typedef struct cb_bridge_map { | ||
107 | u_char map; | ||
108 | u_char flags; | ||
109 | u_int start, stop; | ||
110 | } cb_bridge_map; | ||
111 | |||
112 | /* | ||
113 | * Socket operations. | ||
114 | */ | ||
115 | struct pcmcia_socket; | ||
116 | |||
117 | struct pccard_operations { | ||
118 | int (*init)(struct pcmcia_socket *sock); | ||
119 | int (*suspend)(struct pcmcia_socket *sock); | ||
120 | int (*get_status)(struct pcmcia_socket *sock, u_int *value); | ||
121 | int (*set_socket)(struct pcmcia_socket *sock, socket_state_t *state); | ||
122 | int (*set_io_map)(struct pcmcia_socket *sock, struct pccard_io_map *io); | ||
123 | int (*set_mem_map)(struct pcmcia_socket *sock, struct pccard_mem_map *mem); | ||
124 | }; | ||
125 | |||
126 | struct pccard_resource_ops { | ||
127 | int (*validate_mem) (struct pcmcia_socket *s); | ||
128 | int (*adjust_io_region) (struct resource *res, | ||
129 | unsigned long r_start, | ||
130 | unsigned long r_end, | ||
131 | struct pcmcia_socket *s); | ||
132 | struct resource* (*find_io) (unsigned long base, int num, | ||
133 | unsigned long align, | ||
134 | struct pcmcia_socket *s); | ||
135 | struct resource* (*find_mem) (unsigned long base, unsigned long num, | ||
136 | unsigned long align, int low, | ||
137 | struct pcmcia_socket *s); | ||
138 | int (*add_io) (struct pcmcia_socket *s, | ||
139 | unsigned int action, | ||
140 | unsigned long r_start, | ||
141 | unsigned long r_end); | ||
142 | int (*add_mem) (struct pcmcia_socket *s, | ||
143 | unsigned int action, | ||
144 | unsigned long r_start, | ||
145 | unsigned long r_end); | ||
146 | int (*init) (struct pcmcia_socket *s); | ||
147 | void (*exit) (struct pcmcia_socket *s); | ||
148 | }; | ||
149 | /* SS_CAP_STATIC_MAP */ | ||
150 | extern struct pccard_resource_ops pccard_static_ops; | ||
151 | /* !SS_CAP_STATIC_MAP */ | ||
152 | extern struct pccard_resource_ops pccard_nonstatic_ops; | ||
153 | |||
154 | /* static mem, dynamic IO sockets */ | ||
155 | extern struct pccard_resource_ops pccard_iodyn_ops; | ||
156 | |||
157 | /* | ||
158 | * Calls to set up low-level "Socket Services" drivers | ||
159 | */ | ||
160 | struct pcmcia_socket; | ||
161 | |||
162 | typedef struct io_window_t { | 105 | typedef struct io_window_t { |
163 | u_int InUse, Config; | 106 | u_int InUse, Config; |
164 | struct resource *res; | 107 | struct resource *res; |
@@ -179,10 +122,25 @@ typedef struct window_t { | |||
179 | /* Maximum number of memory windows per socket */ | 122 | /* Maximum number of memory windows per socket */ |
180 | #define MAX_WIN 4 | 123 | #define MAX_WIN 4 |
181 | 124 | ||
125 | |||
126 | /* | ||
127 | * Socket operations. | ||
128 | */ | ||
129 | struct pcmcia_socket; | ||
130 | struct pccard_resource_ops; | ||
182 | struct config_t; | 131 | struct config_t; |
183 | struct pcmcia_callback; | 132 | struct pcmcia_callback; |
184 | struct user_info_t; | 133 | struct user_info_t; |
185 | 134 | ||
135 | struct pccard_operations { | ||
136 | int (*init)(struct pcmcia_socket *s); | ||
137 | int (*suspend)(struct pcmcia_socket *s); | ||
138 | int (*get_status)(struct pcmcia_socket *s, u_int *value); | ||
139 | int (*set_socket)(struct pcmcia_socket *s, socket_state_t *state); | ||
140 | int (*set_io_map)(struct pcmcia_socket *s, struct pccard_io_map *io); | ||
141 | int (*set_mem_map)(struct pcmcia_socket *s, struct pccard_mem_map *mem); | ||
142 | }; | ||
143 | |||
186 | struct pcmcia_socket { | 144 | struct pcmcia_socket { |
187 | struct module *owner; | 145 | struct module *owner; |
188 | spinlock_t lock; | 146 | spinlock_t lock; |
@@ -199,8 +157,8 @@ struct pcmcia_socket { | |||
199 | io_window_t io[MAX_IO_WIN]; | 157 | io_window_t io[MAX_IO_WIN]; |
200 | window_t win[MAX_WIN]; | 158 | window_t win[MAX_WIN]; |
201 | struct list_head cis_cache; | 159 | struct list_head cis_cache; |
202 | u_int fake_cis_len; | 160 | size_t fake_cis_len; |
203 | char *fake_cis; | 161 | u8 *fake_cis; |
204 | 162 | ||
205 | struct list_head socket_list; | 163 | struct list_head socket_list; |
206 | struct completion socket_released; | 164 | struct completion socket_released; |
@@ -218,12 +176,12 @@ struct pcmcia_socket { | |||
218 | struct pci_dev * cb_dev; | 176 | struct pci_dev * cb_dev; |
219 | 177 | ||
220 | 178 | ||
221 | /* socket setup is done so resources should be able to be allocated. Only | 179 | /* socket setup is done so resources should be able to be allocated. |
222 | * if set to 1, calls to find_{io,mem}_region are handled, and insertion | 180 | * Only if set to 1, calls to find_{io,mem}_region are handled, and |
223 | * events are actually managed by the PCMCIA layer.*/ | 181 | * insertio events are actually managed by the PCMCIA layer.*/ |
224 | u8 resource_setup_done:1; | 182 | u8 resource_setup_done:1; |
225 | 183 | ||
226 | /* is set to one if resource setup is done using adjust_resource_info() */ | 184 | /* It's old if resource setup is done using adjust_resource_info() */ |
227 | u8 resource_setup_old:1; | 185 | u8 resource_setup_old:1; |
228 | u8 resource_setup_new:1; | 186 | u8 resource_setup_new:1; |
229 | 187 | ||
@@ -236,75 +194,101 @@ struct pcmcia_socket { | |||
236 | 194 | ||
237 | /* Zoom video behaviour is so chip specific its not worth adding | 195 | /* Zoom video behaviour is so chip specific its not worth adding |
238 | this to _ops */ | 196 | this to _ops */ |
239 | void (*zoom_video)(struct pcmcia_socket *, int); | 197 | void (*zoom_video)(struct pcmcia_socket *, |
198 | int); | ||
240 | 199 | ||
241 | /* so is power hook */ | 200 | /* so is power hook */ |
242 | int (*power_hook)(struct pcmcia_socket *sock, int operation); | 201 | int (*power_hook)(struct pcmcia_socket *sock, int operation); |
243 | #ifdef CONFIG_CARDBUS | 202 | |
244 | /* allows tuning the CB bridge before loading driver for the CB card */ | 203 | /* allows tuning the CB bridge before loading driver for the CB card */ |
204 | #ifdef CONFIG_CARDBUS | ||
245 | void (*tune_bridge)(struct pcmcia_socket *sock, struct pci_bus *bus); | 205 | void (*tune_bridge)(struct pcmcia_socket *sock, struct pci_bus *bus); |
246 | #endif | 206 | #endif |
247 | 207 | ||
248 | /* state thread */ | 208 | /* state thread */ |
249 | struct mutex skt_mutex; /* protects socket h/w state */ | ||
250 | |||
251 | struct task_struct *thread; | 209 | struct task_struct *thread; |
252 | struct completion thread_done; | 210 | struct completion thread_done; |
253 | spinlock_t thread_lock; /* protects thread_events */ | ||
254 | unsigned int thread_events; | 211 | unsigned int thread_events; |
212 | /* protects socket h/w state */ | ||
213 | struct mutex skt_mutex; | ||
214 | /* protects thread_events */ | ||
215 | spinlock_t thread_lock; | ||
255 | 216 | ||
256 | /* pcmcia (16-bit) */ | 217 | /* pcmcia (16-bit) */ |
257 | struct pcmcia_callback *callback; | 218 | struct pcmcia_callback *callback; |
258 | 219 | ||
259 | #if defined(CONFIG_PCMCIA) || defined(CONFIG_PCMCIA_MODULE) | 220 | #if defined(CONFIG_PCMCIA) || defined(CONFIG_PCMCIA_MODULE) |
260 | struct list_head devices_list; /* PCMCIA devices */ | 221 | /* The following elements refer to 16-bit PCMCIA devices inserted |
261 | u8 device_count; /* the number of devices, used | 222 | * into the socket */ |
262 | * only internally and subject | 223 | struct list_head devices_list; |
263 | * to incorrectness and change */ | 224 | |
225 | /* the number of devices, used only internally and subject to | ||
226 | * incorrectness and change */ | ||
227 | u8 device_count; | ||
264 | 228 | ||
229 | /* 16-bit state: */ | ||
265 | struct { | 230 | struct { |
266 | u8 present:1, /* PCMCIA card is present in socket */ | 231 | /* PCMCIA card is present in socket */ |
267 | busy:1, /* "master" ioctl is used */ | 232 | u8 present:1; |
268 | dead:1, /* pcmcia module is being unloaded */ | 233 | /* "master" ioctl is used */ |
269 | device_add_pending:1, /* a multifunction-device | 234 | u8 busy:1; |
270 | * add event is pending */ | 235 | /* pcmcia module is being unloaded */ |
271 | mfc_pfc:1, /* the pending event adds a mfc (1) or pfc (0) */ | 236 | u8 dead:1; |
272 | reserved:3; | 237 | /* a multifunction-device add event is pending */ |
273 | } pcmcia_state; | 238 | u8 device_add_pending:1; |
274 | 239 | /* the pending event adds a mfc (1) or pfc (0) */ | |
275 | struct work_struct device_add; /* for adding further pseudo-multifunction | 240 | u8 mfc_pfc:1; |
276 | * devices */ | 241 | |
242 | u8 reserved:3; | ||
243 | } pcmcia_state; | ||
244 | |||
245 | |||
246 | /* for adding further pseudo-multifunction devices */ | ||
247 | struct work_struct device_add; | ||
277 | 248 | ||
278 | #ifdef CONFIG_PCMCIA_IOCTL | 249 | #ifdef CONFIG_PCMCIA_IOCTL |
279 | struct user_info_t *user; | 250 | struct user_info_t *user; |
280 | wait_queue_head_t queue; | 251 | wait_queue_head_t queue; |
281 | #endif | 252 | #endif /* CONFIG_PCMCIA_IOCTL */ |
282 | #endif | 253 | #endif /* CONFIG_PCMCIA */ |
283 | 254 | ||
284 | /* cardbus (32-bit) */ | 255 | /* cardbus (32-bit) */ |
285 | #ifdef CONFIG_CARDBUS | 256 | #ifdef CONFIG_CARDBUS |
286 | struct resource * cb_cis_res; | 257 | struct resource * cb_cis_res; |
287 | void __iomem *cb_cis_virt; | 258 | void __iomem *cb_cis_virt; |
288 | #endif | 259 | #endif /* CONFIG_CARDBUS */ |
289 | 260 | ||
290 | /* socket device */ | 261 | /* socket device */ |
291 | struct device dev; | 262 | struct device dev; |
292 | void *driver_data; /* data internal to the socket driver */ | 263 | /* data internal to the socket driver */ |
293 | 264 | void *driver_data; | |
294 | }; | 265 | }; |
295 | 266 | ||
296 | struct pcmcia_socket * pcmcia_get_socket_by_nr(unsigned int nr); | ||
297 | 267 | ||
268 | /* socket drivers must define the resource operations type they use. There | ||
269 | * are three options: | ||
270 | * - pccard_static_ops iomem and ioport areas are assigned statically | ||
271 | * - pccard_iodyn_ops iomem areas is assigned statically, ioport | ||
272 | * areas dynamically | ||
273 | * - pccard_nonstatic_ops iomem and ioport areas are assigned dynamically. | ||
274 | * If this option is selected, use | ||
275 | * "select PCCARD_NONSTATIC" in Kconfig. | ||
276 | */ | ||
277 | extern struct pccard_resource_ops pccard_static_ops; | ||
278 | extern struct pccard_resource_ops pccard_iodyn_ops; | ||
279 | extern struct pccard_resource_ops pccard_nonstatic_ops; | ||
298 | 280 | ||
281 | /* socket drivers are expected to use these callbacks in their .drv struct */ | ||
282 | extern int pcmcia_socket_dev_suspend(struct device *dev, pm_message_t state); | ||
283 | extern int pcmcia_socket_dev_resume(struct device *dev); | ||
284 | |||
285 | /* socket drivers use this callback in their IRQ handler */ | ||
286 | extern void pcmcia_parse_events(struct pcmcia_socket *socket, | ||
287 | unsigned int events); | ||
299 | 288 | ||
300 | extern void pcmcia_parse_events(struct pcmcia_socket *socket, unsigned int events); | 289 | /* to register and unregister a socket */ |
301 | extern int pcmcia_register_socket(struct pcmcia_socket *socket); | 290 | extern int pcmcia_register_socket(struct pcmcia_socket *socket); |
302 | extern void pcmcia_unregister_socket(struct pcmcia_socket *socket); | 291 | extern void pcmcia_unregister_socket(struct pcmcia_socket *socket); |
303 | 292 | ||
304 | extern struct class pcmcia_socket_class; | ||
305 | |||
306 | /* socket drivers are expected to use these callbacks in their .drv struct */ | ||
307 | extern int pcmcia_socket_dev_suspend(struct device *dev, pm_message_t state); | ||
308 | extern int pcmcia_socket_dev_resume(struct device *dev); | ||
309 | 293 | ||
310 | #endif /* _LINUX_SS_H */ | 294 | #endif /* _LINUX_SS_H */ |