aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2008-08-03 02:57:51 -0400
committerDominik Brodowski <linux@dominikbrodowski.net>2008-08-22 20:16:09 -0400
commit1a53088c101789bfca431de709ff6e45e8c77003 (patch)
treeb73ded75664ae5ae2ecfc1f611e6345b4e536110
parent64f346425175ad33812cd693fbca48cd512dab63 (diff)
pcmcia: move config_info_t definition to ioctl-related parts in header files
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
-rw-r--r--include/pcmcia/cs.h21
-rw-r--r--include/pcmcia/ds.h21
2 files changed, 21 insertions, 21 deletions
diff --git a/include/pcmcia/cs.h b/include/pcmcia/cs.h
index ea51a8c4cc50..201705c51bbd 100644
--- a/include/pcmcia/cs.h
+++ b/include/pcmcia/cs.h
@@ -73,27 +73,6 @@ typedef struct event_callback_args_t {
73 void *client_data; 73 void *client_data;
74} event_callback_args_t; 74} event_callback_args_t;
75 75
76/* for GetConfigurationInfo */
77typedef 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 */ 76/* For CardValues field */
98#define CV_OPTION_VALUE 0x01 77#define CV_OPTION_VALUE 0x01
99#define CV_STATUS_VALUE 0x02 78#define CV_STATUS_VALUE 0x02
diff --git a/include/pcmcia/ds.h b/include/pcmcia/ds.h
index 2d36a4f80e5b..a06bbec386bd 100644
--- a/include/pcmcia/ds.h
+++ b/include/pcmcia/ds.h
@@ -74,6 +74,27 @@ typedef struct cisdump_t {
74 cisdata_t Data[CISTPL_MAX_CIS_SIZE]; 74 cisdata_t Data[CISTPL_MAX_CIS_SIZE];
75} cisdump_t; 75} cisdump_t;
76 76
77/* for GetConfigurationInfo */
78typedef struct config_info_t {
79 u_char Function;
80 u_int Attributes;
81 u_int Vcc, Vpp1, Vpp2;
82 u_int IntType;
83 u_int ConfigBase;
84 u_char Status, Pin, Copy, Option, ExtStatus;
85 u_int Present;
86 u_int CardValues;
87 u_int AssignedIRQ;
88 u_int IRQAttributes;
89 ioaddr_t BasePort1;
90 ioaddr_t NumPorts1;
91 u_int Attributes1;
92 ioaddr_t BasePort2;
93 ioaddr_t NumPorts2;
94 u_int Attributes2;
95 u_int IOAddrLines;
96} config_info_t;
97
77typedef union ds_ioctl_arg_t { 98typedef union ds_ioctl_arg_t {
78 adjust_t adjust; 99 adjust_t adjust;
79 config_info_t config; 100 config_info_t config;