Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

pcmcia: cleanup cs_internal.h

Small cleanup to cs_internal.h.

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>

+90 -64
+90 -64
drivers/pcmcia/cs_internal.h
··· 1 1 /* 2 - * cs_internal.h 2 + * cs_internal.h -- definitions internal to the PCMCIA core modules 3 3 * 4 4 * This program is free software; you can redistribute it and/or modify 5 5 * it under the terms of the GNU General Public License version 2 as ··· 10 10 * are Copyright (C) 1999 David A. Hinds. All Rights Reserved. 11 11 * 12 12 * (C) 1999 David A. Hinds 13 + * (C) 2003 - 2008 Dominik Brodowski 14 + * 15 + * 16 + * This file contains definitions _only_ needed by the PCMCIA core modules. 17 + * It must not be included by PCMCIA socket drivers or by PCMCIA device 18 + * drivers. 13 19 */ 14 20 15 21 #ifndef _LINUX_CS_INTERNAL_H ··· 24 18 #include <linux/kref.h> 25 19 26 20 /* Flags in client state */ 27 - #define CLIENT_CONFIG_LOCKED 0x0001 28 - #define CLIENT_IRQ_REQ 0x0002 29 - #define CLIENT_IO_REQ 0x0004 30 - #define CLIENT_UNBOUND 0x0008 31 - #define CLIENT_STALE 0x0010 32 21 #define CLIENT_WIN_REQ(i) (0x1<<(i)) 33 - #define CLIENT_CARDBUS 0x8000 34 22 35 23 /* Each card function gets one of these guys */ 36 24 typedef struct config_t { 37 25 struct kref ref; 38 - u_int state; 39 - u_int Attributes; 40 - u_int IntType; 41 - u_int ConfigBase; 42 - u_char Status, Pin, Copy, Option, ExtStatus; 43 - u_int CardValues; 44 - io_req_t io; 45 - struct { 46 - u_int Attributes; 47 - } irq; 26 + unsigned int state; 27 + unsigned int Attributes; 28 + unsigned int IntType; 29 + unsigned int ConfigBase; 30 + unsigned char Status, Pin, Copy, Option, ExtStatus; 31 + unsigned int CardValues; 32 + io_req_t io; 33 + struct { 34 + u_int Attributes; 35 + } irq; 48 36 } config_t; 37 + 49 38 50 39 struct cis_cache_entry { 51 40 struct list_head node; ··· 60 59 #define SOCKET_INUSE 0x0010 61 60 #define SOCKET_SUSPEND 0x0080 62 61 #define SOCKET_WIN_REQ(i) (0x0100<<(i)) 63 - #define SOCKET_REGION_INFO 0x4000 64 62 #define SOCKET_CARDBUS 0x8000 65 63 #define SOCKET_CARDBUS_CONFIG 0x10000 66 64 ··· 83 83 } 84 84 } 85 85 86 - /* In cardbus.c */ 87 - int cb_alloc(struct pcmcia_socket *s); 88 - void cb_free(struct pcmcia_socket *s); 89 - int read_cb_mem(struct pcmcia_socket *s, int space, u_int addr, u_int len, void *ptr); 90 - 91 - /* In cistpl.c */ 92 - int pcmcia_read_cis_mem(struct pcmcia_socket *s, int attr, 93 - u_int addr, u_int len, void *ptr); 94 - void pcmcia_write_cis_mem(struct pcmcia_socket *s, int attr, 95 - u_int addr, u_int len, void *ptr); 96 - void release_cis_mem(struct pcmcia_socket *s); 97 - void destroy_cis_cache(struct pcmcia_socket *s); 98 - int verify_cis_cache(struct pcmcia_socket *s); 99 - int pccard_read_tuple(struct pcmcia_socket *s, unsigned int function, cisdata_t code, void *parse); 100 - 101 - /* In rsrc_mgr */ 102 - int pcmcia_validate_mem(struct pcmcia_socket *s); 103 - struct resource *pcmcia_find_io_region(unsigned long base, int num, unsigned long align, 104 - struct pcmcia_socket *s); 105 - int pcmcia_adjust_io_region(struct resource *res, unsigned long r_start, 106 - unsigned long r_end, struct pcmcia_socket *s); 107 - struct resource *pcmcia_find_mem_region(u_long base, u_long num, u_long align, 108 - int low, struct pcmcia_socket *s); 109 - void release_resource_db(struct pcmcia_socket *s); 110 - 111 - /* In socket_sysfs.c */ 112 - extern int pccard_sysfs_add_socket(struct device *dev); 113 - extern void pccard_sysfs_remove_socket(struct device *dev); 114 - 115 - /* In cs.c */ 116 - extern struct rw_semaphore pcmcia_socket_list_rwsem; 117 - extern struct list_head pcmcia_socket_list; 118 - int pcmcia_get_window(struct pcmcia_socket *s, window_handle_t *handle, int idx, win_req_t *req); 119 - int pccard_reset_card(struct pcmcia_socket *skt); 120 - 121 - 122 - struct pcmcia_callback{ 123 - struct module *owner; 124 - int (*event) (struct pcmcia_socket *s, event_t event, int priority); 125 - void (*requery) (struct pcmcia_socket *s, int new_cis); 126 - int (*suspend) (struct pcmcia_socket *s); 127 - int (*resume) (struct pcmcia_socket *s); 128 - }; 129 - 130 - int pccard_register_pcmcia(struct pcmcia_socket *s, struct pcmcia_callback *c); 131 - 132 86 #ifdef CONFIG_PCMCIA_DEBUG 133 87 extern int cs_debug_level(int); 134 88 ··· 104 150 105 151 #define cs_err(skt, fmt, arg...) \ 106 152 dev_printk(KERN_ERR, &skt->dev, "cs: " fmt, ## arg) 153 + 154 + 155 + /* 156 + * Stuff internal to module "pcmcia_core": 157 + */ 158 + 159 + /* cistpl.c */ 160 + int verify_cis_cache(struct pcmcia_socket *s); 161 + 162 + /* rsrc_mgr.c */ 163 + void release_resource_db(struct pcmcia_socket *s); 164 + 165 + /* socket_sysfs.c */ 166 + extern int pccard_sysfs_add_socket(struct device *dev); 167 + extern void pccard_sysfs_remove_socket(struct device *dev); 168 + 169 + /* cardbus.c */ 170 + int cb_alloc(struct pcmcia_socket *s); 171 + void cb_free(struct pcmcia_socket *s); 172 + int read_cb_mem(struct pcmcia_socket *s, int space, u_int addr, u_int len, 173 + void *ptr); 174 + 175 + 176 + 177 + /* 178 + * Stuff exported by module "pcmcia_core" to module "pcmcia" 179 + */ 180 + 181 + struct pcmcia_callback{ 182 + struct module *owner; 183 + int (*event) (struct pcmcia_socket *s, 184 + event_t event, int priority); 185 + void (*requery) (struct pcmcia_socket *s, int new_cis); 186 + int (*suspend) (struct pcmcia_socket *s); 187 + int (*resume) (struct pcmcia_socket *s); 188 + }; 189 + 190 + /* cs.c */ 191 + extern struct rw_semaphore pcmcia_socket_list_rwsem; 192 + extern struct list_head pcmcia_socket_list; 193 + int pcmcia_get_window(struct pcmcia_socket *s, 194 + window_handle_t *handle, 195 + int idx, 196 + win_req_t *req); 197 + int pccard_reset_card(struct pcmcia_socket *skt); 198 + int pccard_register_pcmcia(struct pcmcia_socket *s, struct pcmcia_callback *c); 199 + 200 + /* cistpl.c */ 201 + int pcmcia_read_cis_mem(struct pcmcia_socket *s, int attr, 202 + u_int addr, u_int len, void *ptr); 203 + void pcmcia_write_cis_mem(struct pcmcia_socket *s, int attr, 204 + u_int addr, u_int len, void *ptr); 205 + void release_cis_mem(struct pcmcia_socket *s); 206 + void destroy_cis_cache(struct pcmcia_socket *s); 207 + int pccard_read_tuple(struct pcmcia_socket *s, unsigned int function, 208 + cisdata_t code, void *parse); 209 + 210 + /* rsrc_mgr.c */ 211 + int pcmcia_validate_mem(struct pcmcia_socket *s); 212 + struct resource *pcmcia_find_io_region(unsigned long base, 213 + int num, 214 + unsigned long align, 215 + struct pcmcia_socket *s); 216 + int pcmcia_adjust_io_region(struct resource *res, 217 + unsigned long r_start, 218 + unsigned long r_end, 219 + struct pcmcia_socket *s); 220 + struct resource *pcmcia_find_mem_region(u_long base, 221 + u_long num, 222 + u_long align, 223 + int low, 224 + struct pcmcia_socket *s); 107 225 108 226 #endif /* _LINUX_CS_INTERNAL_H */