diff options
Diffstat (limited to 'include/pcmcia')
-rw-r--r-- | include/pcmcia/cistpl.h | 18 | ||||
-rw-r--r-- | include/pcmcia/ds.h | 6 | ||||
-rw-r--r-- | include/pcmcia/ss.h | 4 |
3 files changed, 18 insertions, 10 deletions
diff --git a/include/pcmcia/cistpl.h b/include/pcmcia/cistpl.h index e2e10c1e9a06..75a9d34c6346 100644 --- a/include/pcmcia/cistpl.h +++ b/include/pcmcia/cistpl.h | |||
@@ -580,14 +580,8 @@ typedef struct cisinfo_t { | |||
580 | 580 | ||
581 | #define CISTPL_MAX_CIS_SIZE 0x200 | 581 | #define CISTPL_MAX_CIS_SIZE 0x200 |
582 | 582 | ||
583 | /* For ReplaceCIS */ | 583 | int pcmcia_replace_cis(struct pcmcia_socket *s, |
584 | typedef struct cisdump_t { | 584 | const u8 *data, const size_t len); |
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 | 585 | ||
592 | /* don't use outside of PCMCIA core yet */ | 586 | /* don't use outside of PCMCIA core yet */ |
593 | int pccard_get_next_tuple(struct pcmcia_socket *s, unsigned int func, tuple_t *tuple); | 587 | int pccard_get_next_tuple(struct pcmcia_socket *s, unsigned int func, tuple_t *tuple); |
@@ -613,4 +607,12 @@ int pccard_validate_cis(struct pcmcia_socket *s, unsigned int function, unsigned | |||
613 | #define pcmcia_validate_cis(p_dev, info) \ | 607 | #define pcmcia_validate_cis(p_dev, info) \ |
614 | pccard_validate_cis(p_dev->socket, p_dev->func, info) | 608 | pccard_validate_cis(p_dev->socket, p_dev->func, info) |
615 | 609 | ||
610 | int pcmcia_loop_config(struct pcmcia_device *p_dev, | ||
611 | int (*conf_check) (struct pcmcia_device *p_dev, | ||
612 | cistpl_cftable_entry_t *cf, | ||
613 | cistpl_cftable_entry_t *dflt, | ||
614 | unsigned int vcc, | ||
615 | void *priv_data), | ||
616 | void *priv_data); | ||
617 | |||
616 | #endif /* LINUX_CISTPL_H */ | 618 | #endif /* LINUX_CISTPL_H */ |
diff --git a/include/pcmcia/ds.h b/include/pcmcia/ds.h index b316027c853d..2d36a4f80e5b 100644 --- a/include/pcmcia/ds.h +++ b/include/pcmcia/ds.h | |||
@@ -68,6 +68,12 @@ typedef struct region_info_t { | |||
68 | #define REGION_BAR_MASK 0xe000 | 68 | #define REGION_BAR_MASK 0xe000 |
69 | #define REGION_BAR_SHIFT 13 | 69 | #define REGION_BAR_SHIFT 13 |
70 | 70 | ||
71 | /* For ReplaceCIS */ | ||
72 | typedef struct cisdump_t { | ||
73 | u_int Length; | ||
74 | cisdata_t Data[CISTPL_MAX_CIS_SIZE]; | ||
75 | } cisdump_t; | ||
76 | |||
71 | typedef union ds_ioctl_arg_t { | 77 | typedef union ds_ioctl_arg_t { |
72 | adjust_t adjust; | 78 | adjust_t adjust; |
73 | config_info_t config; | 79 | config_info_t config; |
diff --git a/include/pcmcia/ss.h b/include/pcmcia/ss.h index ed919dd9bb5c..e34bef0fc74f 100644 --- a/include/pcmcia/ss.h +++ b/include/pcmcia/ss.h | |||
@@ -199,8 +199,8 @@ struct pcmcia_socket { | |||
199 | io_window_t io[MAX_IO_WIN]; | 199 | io_window_t io[MAX_IO_WIN]; |
200 | window_t win[MAX_WIN]; | 200 | window_t win[MAX_WIN]; |
201 | struct list_head cis_cache; | 201 | struct list_head cis_cache; |
202 | u_int fake_cis_len; | 202 | size_t fake_cis_len; |
203 | char *fake_cis; | 203 | u8 *fake_cis; |
204 | 204 | ||
205 | struct list_head socket_list; | 205 | struct list_head socket_list; |
206 | struct completion socket_released; | 206 | struct completion socket_released; |