pcmcia: move config_info_t definition to ioctl-related parts in header files
Dominik Brodowski [Sun, 3 Aug 2008 06:57:51 +0000 (08:57 +0200)]
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>

include/pcmcia/cs.h
include/pcmcia/ds.h

index ea51a8c..201705c 100644 (file)
@@ -73,27 +73,6 @@ typedef struct event_callback_args_t {
        void                    *client_data;
 } event_callback_args_t;
 
-/* for GetConfigurationInfo */
-typedef struct config_info_t {
-    u_char     Function;
-    u_int      Attributes;
-    u_int      Vcc, Vpp1, Vpp2;
-    u_int      IntType;
-    u_int      ConfigBase;
-    u_char     Status, Pin, Copy, Option, ExtStatus;
-    u_int      Present;
-    u_int      CardValues;
-    u_int      AssignedIRQ;
-    u_int      IRQAttributes;
-    ioaddr_t   BasePort1;
-    ioaddr_t   NumPorts1;
-    u_int      Attributes1;
-    ioaddr_t   BasePort2;
-    ioaddr_t   NumPorts2;
-    u_int      Attributes2;
-    u_int      IOAddrLines;
-} config_info_t;
-
 /* For CardValues field */
 #define CV_OPTION_VALUE                0x01
 #define CV_STATUS_VALUE                0x02
index 2d36a4f..a06bbec 100644 (file)
@@ -74,6 +74,27 @@ typedef struct cisdump_t {
     cisdata_t  Data[CISTPL_MAX_CIS_SIZE];
 } cisdump_t;
 
+/* for GetConfigurationInfo */
+typedef struct config_info_t {
+    u_char     Function;
+    u_int      Attributes;
+    u_int      Vcc, Vpp1, Vpp2;
+    u_int      IntType;
+    u_int      ConfigBase;
+    u_char     Status, Pin, Copy, Option, ExtStatus;
+    u_int      Present;
+    u_int      CardValues;
+    u_int      AssignedIRQ;
+    u_int      IRQAttributes;
+    ioaddr_t   BasePort1;
+    ioaddr_t   NumPorts1;
+    u_int      Attributes1;
+    ioaddr_t   BasePort2;
+    ioaddr_t   NumPorts2;
+    u_int      Attributes2;
+    u_int      IOAddrLines;
+} config_info_t;
+
 typedef union ds_ioctl_arg_t {
     adjust_t           adjust;
     config_info_t      config;