diff options
author | Dominik Brodowski <linux@dominikbrodowski.net> | 2008-08-31 09:20:26 -0400 |
---|---|---|
committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2008-08-31 09:25:47 -0400 |
commit | 994917f8b718f1cd7114317cc3cbf04fe46c1841 (patch) | |
tree | 18bcc749026fbd3216e68353a993f7c20880e5a0 /include/pcmcia/cs.h | |
parent | 35200d865d49d0207b054074055e1487a0c28ae4 (diff) |
pcmcia: card services header cleanup
16-bit PCMCIA device handling function definitions are moved to ds.h,
internal definitions to cs_internal.h.
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'include/pcmcia/cs.h')
-rw-r--r-- | include/pcmcia/cs.h | 67 |
1 files changed, 0 insertions, 67 deletions
diff --git a/include/pcmcia/cs.h b/include/pcmcia/cs.h index 42c8759f0bdc..6944a74d3a7c 100644 --- a/include/pcmcia/cs.h +++ b/include/pcmcia/cs.h | |||
@@ -201,16 +201,6 @@ typedef struct win_req_t { | |||
201 | #define WIN_BAR_MASK 0xe000 | 201 | #define WIN_BAR_MASK 0xe000 |
202 | #define WIN_BAR_SHIFT 13 | 202 | #define WIN_BAR_SHIFT 13 |
203 | 203 | ||
204 | /* Attributes for RegisterClient -- UNUSED -- */ | ||
205 | #define INFO_MASTER_CLIENT 0x01 | ||
206 | #define INFO_IO_CLIENT 0x02 | ||
207 | #define INFO_MTD_CLIENT 0x04 | ||
208 | #define INFO_MEM_CLIENT 0x08 | ||
209 | #define MAX_NUM_CLIENTS 3 | ||
210 | |||
211 | #define INFO_CARD_SHARE 0x10 | ||
212 | #define INFO_CARD_EXCL 0x20 | ||
213 | |||
214 | typedef struct cs_status_t { | 204 | typedef struct cs_status_t { |
215 | u_char Function; | 205 | u_char Function; |
216 | event_t CardState; | 206 | event_t CardState; |
@@ -252,61 +242,4 @@ typedef struct error_info_t { | |||
252 | #define CS_EVENT_3VCARD 0x200000 | 242 | #define CS_EVENT_3VCARD 0x200000 |
253 | #define CS_EVENT_XVCARD 0x400000 | 243 | #define CS_EVENT_XVCARD 0x400000 |
254 | 244 | ||
255 | |||
256 | #ifdef __KERNEL__ | ||
257 | |||
258 | /* | ||
259 | * The main Card Services entry point | ||
260 | */ | ||
261 | |||
262 | enum service { | ||
263 | AccessConfigurationRegister, AddSocketServices, | ||
264 | AdjustResourceInfo, CheckEraseQueue, CloseMemory, CopyMemory, | ||
265 | DeregisterClient, DeregisterEraseQueue, GetCardServicesInfo, | ||
266 | GetClientInfo, GetConfigurationInfo, GetEventMask, | ||
267 | GetFirstClient, GetFirstPartion, GetFirstRegion, GetFirstTuple, | ||
268 | GetNextClient, GetNextPartition, GetNextRegion, GetNextTuple, | ||
269 | GetStatus, GetTupleData, MapLogSocket, MapLogWindow, MapMemPage, | ||
270 | MapPhySocket, MapPhyWindow, ModifyConfiguration, ModifyWindow, | ||
271 | OpenMemory, ParseTuple, ReadMemory, RegisterClient, | ||
272 | RegisterEraseQueue, RegisterMTD, RegisterTimer, | ||
273 | ReleaseConfiguration, ReleaseExclusive, ReleaseIO, ReleaseIRQ, | ||
274 | ReleaseSocketMask, ReleaseWindow, ReplaceSocketServices, | ||
275 | RequestConfiguration, RequestExclusive, RequestIO, RequestIRQ, | ||
276 | RequestSocketMask, RequestWindow, ResetCard, ReturnSSEntry, | ||
277 | SetEventMask, SetRegion, ValidateCIS, VendorSpecific, | ||
278 | WriteMemory, BindDevice, BindMTD, ReportError, | ||
279 | SuspendCard, ResumeCard, EjectCard, InsertCard, ReplaceCIS, | ||
280 | GetFirstWindow, GetNextWindow, GetMemPage | ||
281 | }; | ||
282 | |||
283 | struct pcmcia_socket; | ||
284 | |||
285 | int pcmcia_access_configuration_register(struct pcmcia_device *p_dev, conf_reg_t *reg); | ||
286 | int pcmcia_get_mem_page(window_handle_t win, memreq_t *req); | ||
287 | int pcmcia_map_mem_page(window_handle_t win, memreq_t *req); | ||
288 | int pcmcia_modify_configuration(struct pcmcia_device *p_dev, modconf_t *mod); | ||
289 | int pcmcia_release_window(window_handle_t win); | ||
290 | int pcmcia_request_configuration(struct pcmcia_device *p_dev, config_req_t *req); | ||
291 | int pcmcia_request_io(struct pcmcia_device *p_dev, io_req_t *req); | ||
292 | int pcmcia_request_irq(struct pcmcia_device *p_dev, irq_req_t *req); | ||
293 | int pcmcia_request_window(struct pcmcia_device **p_dev, win_req_t *req, window_handle_t *wh); | ||
294 | int pcmcia_suspend_card(struct pcmcia_socket *skt); | ||
295 | int pcmcia_resume_card(struct pcmcia_socket *skt); | ||
296 | int pcmcia_eject_card(struct pcmcia_socket *skt); | ||
297 | int pcmcia_insert_card(struct pcmcia_socket *skt); | ||
298 | int pccard_reset_card(struct pcmcia_socket *skt); | ||
299 | |||
300 | struct pcmcia_device * pcmcia_dev_present(struct pcmcia_device *p_dev); | ||
301 | void pcmcia_disable_device(struct pcmcia_device *p_dev); | ||
302 | |||
303 | struct pcmcia_socket * pcmcia_get_socket(struct pcmcia_socket *skt); | ||
304 | void pcmcia_put_socket(struct pcmcia_socket *skt); | ||
305 | |||
306 | /* compatibility functions */ | ||
307 | #define pcmcia_reset_card(p_dev, req) \ | ||
308 | pccard_reset_card(p_dev->socket) | ||
309 | |||
310 | #endif /* __KERNEL__ */ | ||
311 | |||
312 | #endif /* _LINUX_CS_H */ | 245 | #endif /* _LINUX_CS_H */ |