Linux-2.6.12-rc2v2.6.12-rc2

Initial git repository build. I'm not bothering with the full history,
even though we have it. We can create a separate "historical" git
archive of that later if we want to, and in the meantime it's about
3.2GB when imported into git - space that would just make the early
git days unnecessarily complicated, when we don't have a lot of good
infrastructure for it.

Let it rip!

10 files changed, 1953 insertions, 0 deletions

diff --git a/include/pcmcia/bulkmem.h b/include/pcmcia/bulkmem.h
new file mode 100644
index 000000000000..b53b78d497ba
--- /dev/null
+++ b/include/pcmcia/bulkmem.h
@@ -0,0 +1,41 @@
+/*
+ * bulkmem.h -- Definitions for bulk memory services
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * The initial developer of the original code is David A. Hinds
+ * <dahinds@users.sourceforge.net>.  Portions created by David A. Hinds
+ * are Copyright (C) 1999 David A. Hinds.  All Rights Reserved.
+ *
+ * (C) 1999             David A. Hinds
+ */
+
+#ifndef _LINUX_BULKMEM_H
+#define _LINUX_BULKMEM_H
+
+/* For GetFirstRegion and GetNextRegion */
+typedef struct region_info_t {
+    u_int               Attributes;
+    u_int               CardOffset;
+    u_int               RegionSize;
+    u_int               AccessSpeed;
+    u_int               BlockSize;
+    u_int               PartMultiple;
+    u_char              JedecMfr, JedecInfo;
+    memory_handle_t     next;
+} region_info_t;
+
+#define REGION_TYPE             0x0001
+#define REGION_TYPE_CM          0x0000
+#define REGION_TYPE_AM          0x0001
+#define REGION_PREFETCH         0x0008
+#define REGION_CACHEABLE        0x0010
+#define REGION_BAR_MASK         0xe000
+#define REGION_BAR_SHIFT        13
+
+int pcmcia_get_first_region(client_handle_t handle, region_info_t *rgn);
+int pcmcia_get_next_region(client_handle_t handle, region_info_t *rgn);
+
+#endif /* _LINUX_BULKMEM_H */
diff --git a/include/pcmcia/ciscode.h b/include/pcmcia/ciscode.h
new file mode 100644
index 000000000000..2000b43ece91
--- /dev/null
+++ b/include/pcmcia/ciscode.h
@@ -0,0 +1,123 @@
+/*
+ * ciscode.h -- Definitions for bulk memory services
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * The initial developer of the original code is David A. Hinds
+ * <dahinds@users.sourceforge.net>.  Portions created by David A. Hinds
+ * are Copyright (C) 1999 David A. Hinds.  All Rights Reserved.
+ *
+ * (C) 1999             David A. Hinds
+ */
+
+#ifndef _LINUX_CISCODE_H
+#define _LINUX_CISCODE_H
+
+/* Manufacturer and Product ID codes */
+
+#define MANFID_3COM                     0x0101
+#define PRODID_3COM_3CXEM556            0x0035
+#define PRODID_3COM_3CCFEM556           0x0556
+#define PRODID_3COM_3C562               0x0562
+
+#define MANFID_ACCTON                   0x01bf
+#define PRODID_ACCTON_EN2226            0x010a
+
+#define MANFID_ADAPTEC                  0x012f
+#define PRODID_ADAPTEC_SCSI             0x0001
+
+#define MANFID_ATT                      0xffff
+#define PRODID_ATT_KIT                  0x0100
+
+#define MANFID_CONTEC                   0xc001
+
+#define MANFID_FUJITSU                  0x0004
+#define PRODID_FUJITSU_MBH10302         0x0004
+#define PRODID_FUJITSU_MBH10304         0x1003
+#define PRODID_FUJITSU_LA501            0x2000
+
+#define MANFID_IBM                      0x00a4
+#define PRODID_IBM_HOME_AND_AWAY        0x002e
+
+#define MANFID_INTEL                    0x0089
+#define PRODID_INTEL_DUAL_RS232         0x0301
+#define PRODID_INTEL_2PLUS              0x8422
+
+#define MANFID_KME                      0x0032
+#define PRODID_KME_KXLC005_A            0x0704
+#define PRODID_KME_KXLC005_B            0x2904
+
+#define MANFID_LINKSYS                  0x0143
+#define PRODID_LINKSYS_PCMLM28          0xc0ab
+#define PRODID_LINKSYS_3400             0x3341
+
+#define MANFID_MEGAHERTZ                0x0102
+#define PRODID_MEGAHERTZ_VARIOUS        0x0000
+#define PRODID_MEGAHERTZ_EM3288         0x0006
+
+#define MANFID_MACNICA                  0xc00b
+
+#define MANFID_MOTOROLA                 0x0109
+#define PRODID_MOTOROLA_MARINER         0x0501
+
+#define MANFID_NATINST                  0x010b
+#define PRODID_NATINST_QUAD_RS232       0xd180
+
+#define MANFID_NEW_MEDIA                0x0057
+
+#define MANFID_NOKIA                    0x0124
+#define PRODID_NOKIA_CARDPHONE          0x0900
+
+#define MANFID_OLICOM                   0x0121
+#define PRODID_OLICOM_OC2231            0x3122
+#define PRODID_OLICOM_OC2232            0x3222
+
+#define MANFID_OMEGA                    0x0137
+#define PRODID_OMEGA_QSP_100            0x0025
+
+#define MANFID_OSITECH                  0x0140
+#define PRODID_OSITECH_JACK_144         0x0001
+#define PRODID_OSITECH_JACK_288         0x0002
+#define PRODID_OSITECH_JACK_336         0x0007
+#define PRODID_OSITECH_SEVEN            0x0008
+
+#define MANFID_OXSEMI                   0x0279
+
+#define MANFID_PIONEER                  0x000b
+
+#define MANFID_PSION                    0x016c
+#define PRODID_PSION_NET100             0x0023
+
+#define MANFID_QUATECH                  0x0137
+#define PRODID_QUATECH_SPP100           0x0003
+#define PRODID_QUATECH_DUAL_RS232       0x0012
+#define PRODID_QUATECH_DUAL_RS232_D1    0x0007
+#define PRODID_QUATECH_DUAL_RS232_D2    0x0052
+#define PRODID_QUATECH_QUAD_RS232       0x001b
+#define PRODID_QUATECH_DUAL_RS422       0x000e
+#define PRODID_QUATECH_QUAD_RS422       0x0045
+
+#define MANFID_SMC                      0x0108
+#define PRODID_SMC_ETHER                0x0105
+
+#define MANFID_SOCKET                   0x0104
+#define PRODID_SOCKET_DUAL_RS232        0x0006
+#define PRODID_SOCKET_EIO               0x000a
+#define PRODID_SOCKET_LPE               0x000d
+#define PRODID_SOCKET_LPE_CF            0x0075
+
+#define MANFID_SUNDISK                  0x0045
+
+#define MANFID_TDK                      0x0105
+#define PRODID_TDK_CF010                0x0900
+#define PRODID_TDK_GN3410               0x4815
+
+#define MANFID_TOSHIBA                  0x0098
+
+#define MANFID_UNGERMANN 0x02c0
+
+#define MANFID_XIRCOM                   0x0105
+
+#endif /* _LINUX_CISCODE_H */
diff --git a/include/pcmcia/cisreg.h b/include/pcmcia/cisreg.h
new file mode 100644
index 000000000000..ddaad465502e
--- /dev/null
+++ b/include/pcmcia/cisreg.h
@@ -0,0 +1,120 @@
+/*
+ * cisreg.h
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * The initial developer of the original code is David A. Hinds
+ * <dahinds@users.sourceforge.net>.  Portions created by David A. Hinds
+ * are Copyright (C) 1999 David A. Hinds.  All Rights Reserved.
+ *
+ * (C) 1999             David A. Hinds
+ */
+
+#ifndef _LINUX_CISREG_H
+#define _LINUX_CISREG_H
+
+/*
+ * Offsets from ConfigBase for CIS registers
+ */
+#define CISREG_COR              0x00
+#define CISREG_CCSR             0x02
+#define CISREG_PRR              0x04
+#define CISREG_SCR              0x06
+#define CISREG_ESR              0x08
+#define CISREG_IOBASE_0         0x0a
+#define CISREG_IOBASE_1         0x0c
+#define CISREG_IOBASE_2         0x0e
+#define CISREG_IOBASE_3         0x10
+#define CISREG_IOSIZE           0x12
+
+/*
+ * Configuration Option Register
+ */
+#define COR_CONFIG_MASK         0x3f
+#define COR_MFC_CONFIG_MASK     0x38
+#define COR_FUNC_ENA            0x01
+#define COR_ADDR_DECODE         0x02
+#define COR_IREQ_ENA            0x04
+#define COR_LEVEL_REQ           0x40
+#define COR_SOFT_RESET          0x80
+
+/*
+ * Card Configuration and Status Register
+ */
+#define CCSR_INTR_ACK           0x01
+#define CCSR_INTR_PENDING       0x02
+#define CCSR_POWER_DOWN         0x04
+#define CCSR_AUDIO_ENA          0x08
+#define CCSR_IOIS8              0x20
+#define CCSR_SIGCHG_ENA         0x40
+#define CCSR_CHANGED            0x80
+
+/*
+ * Pin Replacement Register
+ */
+#define PRR_WP_STATUS           0x01
+#define PRR_READY_STATUS        0x02
+#define PRR_BVD2_STATUS         0x04
+#define PRR_BVD1_STATUS         0x08
+#define PRR_WP_EVENT            0x10
+#define PRR_READY_EVENT         0x20
+#define PRR_BVD2_EVENT          0x40
+#define PRR_BVD1_EVENT          0x80
+
+/*
+ * Socket and Copy Register
+ */
+#define SCR_SOCKET_NUM          0x0f
+#define SCR_COPY_NUM            0x70
+
+/*
+ * Extended Status Register
+ */
+#define ESR_REQ_ATTN_ENA        0x01
+#define ESR_REQ_ATTN            0x10
+
+/*
+ * CardBus Function Status Registers
+ */
+#define CBFN_EVENT              0x00
+#define CBFN_MASK               0x04
+#define CBFN_STATE              0x08
+#define CBFN_FORCE              0x0c
+
+/*
+ * These apply to all the CardBus function registers
+ */
+#define CBFN_WP                 0x0001
+#define CBFN_READY              0x0002
+#define CBFN_BVD2               0x0004
+#define CBFN_BVD1               0x0008
+#define CBFN_GWAKE              0x0010
+#define CBFN_INTR               0x8000
+
+/*
+ * Extra bits in the Function Event Mask Register
+ */
+#define FEMR_BAM_ENA            0x0020
+#define FEMR_PWM_ENA            0x0040
+#define FEMR_WKUP_MASK          0x4000
+
+/*
+ * Indirect Addressing Registers for Zoomed Video: these are addresses
+ * in common memory space
+ */
+#define CISREG_ICTRL0           0x02    /* control registers */
+#define CISREG_ICTRL1           0x03
+#define CISREG_IADDR0           0x04    /* address registers */
+#define CISREG_IADDR1           0x05
+#define CISREG_IADDR2           0x06
+#define CISREG_IADDR3           0x07
+#define CISREG_IDATA0           0x08    /* data registers */
+#define CISREG_IDATA1           0x09
+
+#define ICTRL0_COMMON           0x01
+#define ICTRL0_AUTOINC          0x02
+#define ICTRL0_BYTEGRAN         0x04
+
+#endif /* _LINUX_CISREG_H */
diff --git a/include/pcmcia/cistpl.h b/include/pcmcia/cistpl.h
new file mode 100644
index 000000000000..c6a069554fd7
--- /dev/null
+++ b/include/pcmcia/cistpl.h
@@ -0,0 +1,605 @@
+/*
+ * cistpl.h
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * The initial developer of the original code is David A. Hinds
+ * <dahinds@users.sourceforge.net>.  Portions created by David A. Hinds
+ * are Copyright (C) 1999 David A. Hinds.  All Rights Reserved.
+ *
+ * (C) 1999             David A. Hinds
+ */
+
+#ifndef _LINUX_CISTPL_H
+#define _LINUX_CISTPL_H
+
+#define CISTPL_NULL             0x00
+#define CISTPL_DEVICE           0x01
+#define CISTPL_LONGLINK_CB      0x02
+#define CISTPL_INDIRECT         0x03
+#define CISTPL_CONFIG_CB        0x04
+#define CISTPL_CFTABLE_ENTRY_CB 0x05
+#define CISTPL_LONGLINK_MFC     0x06
+#define CISTPL_BAR              0x07
+#define CISTPL_PWR_MGMNT        0x08
+#define CISTPL_EXTDEVICE        0x09
+#define CISTPL_CHECKSUM         0x10
+#define CISTPL_LONGLINK_A       0x11
+#define CISTPL_LONGLINK_C       0x12
+#define CISTPL_LINKTARGET       0x13
+#define CISTPL_NO_LINK          0x14
+#define CISTPL_VERS_1           0x15
+#define CISTPL_ALTSTR           0x16
+#define CISTPL_DEVICE_A         0x17
+#define CISTPL_JEDEC_C          0x18
+#define CISTPL_JEDEC_A          0x19
+#define CISTPL_CONFIG           0x1a
+#define CISTPL_CFTABLE_ENTRY    0x1b
+#define CISTPL_DEVICE_OC        0x1c
+#define CISTPL_DEVICE_OA        0x1d
+#define CISTPL_DEVICE_GEO       0x1e
+#define CISTPL_DEVICE_GEO_A     0x1f
+#define CISTPL_MANFID           0x20
+#define CISTPL_FUNCID           0x21
+#define CISTPL_FUNCE            0x22
+#define CISTPL_SWIL             0x23
+#define CISTPL_END              0xff
+/* Layer 2 tuples */
+#define CISTPL_VERS_2           0x40
+#define CISTPL_FORMAT           0x41
+#define CISTPL_GEOMETRY         0x42
+#define CISTPL_BYTEORDER        0x43
+#define CISTPL_DATE             0x44
+#define CISTPL_BATTERY          0x45
+#define CISTPL_FORMAT_A         0x47
+/* Layer 3 tuples */
+#define CISTPL_ORG              0x46
+#define CISTPL_SPCL             0x90
+
+typedef struct cistpl_longlink_t {
+    u_int       addr;
+} cistpl_longlink_t;
+
+typedef struct cistpl_checksum_t {
+    u_short     addr;
+    u_short     len;
+    u_char      sum;
+} cistpl_checksum_t;
+
+#define CISTPL_MAX_FUNCTIONS    8
+#define CISTPL_MFC_ATTR         0x00
+#define CISTPL_MFC_COMMON       0x01
+
+typedef struct cistpl_longlink_mfc_t {
+    u_char      nfn;
+    struct {
+        u_char  space;
+        u_int   addr;
+    } fn[CISTPL_MAX_FUNCTIONS];
+} cistpl_longlink_mfc_t;
+
+#define CISTPL_MAX_ALTSTR_STRINGS       4
+
+typedef struct cistpl_altstr_t {
+    u_char      ns;
+    u_char      ofs[CISTPL_MAX_ALTSTR_STRINGS];
+    char        str[254];
+} cistpl_altstr_t;
+
+#define CISTPL_DTYPE_NULL       0x00
+#define CISTPL_DTYPE_ROM        0x01
+#define CISTPL_DTYPE_OTPROM     0x02
+#define CISTPL_DTYPE_EPROM      0x03
+#define CISTPL_DTYPE_EEPROM     0x04
+#define CISTPL_DTYPE_FLASH      0x05
+#define CISTPL_DTYPE_SRAM       0x06
+#define CISTPL_DTYPE_DRAM       0x07
+#define CISTPL_DTYPE_FUNCSPEC   0x0d
+#define CISTPL_DTYPE_EXTEND     0x0e
+
+#define CISTPL_MAX_DEVICES      4
+
+typedef struct cistpl_device_t {
+    u_char      ndev;
+    struct {
+        u_char  type;
+        u_char  wp;
+        u_int   speed;
+        u_int   size;
+    } dev[CISTPL_MAX_DEVICES];
+} cistpl_device_t;
+
+#define CISTPL_DEVICE_MWAIT     0x01
+#define CISTPL_DEVICE_3VCC      0x02
+
+typedef struct cistpl_device_o_t {
+    u_char              flags;
+    cistpl_device_t     device;
+} cistpl_device_o_t;
+
+#define CISTPL_VERS_1_MAX_PROD_STRINGS  4
+
+typedef struct cistpl_vers_1_t {
+    u_char      major;
+    u_char      minor;
+    u_char      ns;
+    u_char      ofs[CISTPL_VERS_1_MAX_PROD_STRINGS];
+    char        str[254];
+} cistpl_vers_1_t;
+
+typedef struct cistpl_jedec_t {
+    u_char      nid;
+    struct {
+        u_char  mfr;
+        u_char  info;
+    } id[CISTPL_MAX_DEVICES];
+} cistpl_jedec_t;
+
+typedef struct cistpl_manfid_t {
+    u_short     manf;
+    u_short     card;
+} cistpl_manfid_t;
+
+#define CISTPL_FUNCID_MULTI     0x00
+#define CISTPL_FUNCID_MEMORY    0x01
+#define CISTPL_FUNCID_SERIAL    0x02
+#define CISTPL_FUNCID_PARALLEL  0x03
+#define CISTPL_FUNCID_FIXED     0x04
+#define CISTPL_FUNCID_VIDEO     0x05
+#define CISTPL_FUNCID_NETWORK   0x06
+#define CISTPL_FUNCID_AIMS      0x07
+#define CISTPL_FUNCID_SCSI      0x08
+
+#define CISTPL_SYSINIT_POST     0x01
+#define CISTPL_SYSINIT_ROM      0x02
+
+typedef struct cistpl_funcid_t {
+    u_char      func;
+    u_char      sysinit;
+} cistpl_funcid_t;
+
+typedef struct cistpl_funce_t {
+    u_char      type;
+    u_char      data[0];
+} cistpl_funce_t;
+
+/*======================================================================
+
+    Modem Function Extension Tuples
+
+======================================================================*/
+
+#define CISTPL_FUNCE_SERIAL_IF          0x00
+#define CISTPL_FUNCE_SERIAL_CAP         0x01
+#define CISTPL_FUNCE_SERIAL_SERV_DATA   0x02
+#define CISTPL_FUNCE_SERIAL_SERV_FAX    0x03
+#define CISTPL_FUNCE_SERIAL_SERV_VOICE  0x04
+#define CISTPL_FUNCE_SERIAL_CAP_DATA    0x05
+#define CISTPL_FUNCE_SERIAL_CAP_FAX     0x06
+#define CISTPL_FUNCE_SERIAL_CAP_VOICE   0x07
+#define CISTPL_FUNCE_SERIAL_IF_DATA     0x08
+#define CISTPL_FUNCE_SERIAL_IF_FAX      0x09
+#define CISTPL_FUNCE_SERIAL_IF_VOICE    0x0a
+
+/* UART identification */
+#define CISTPL_SERIAL_UART_8250         0x00
+#define CISTPL_SERIAL_UART_16450        0x01
+#define CISTPL_SERIAL_UART_16550        0x02
+#define CISTPL_SERIAL_UART_8251         0x03
+#define CISTPL_SERIAL_UART_8530         0x04
+#define CISTPL_SERIAL_UART_85230        0x05
+
+/* UART capabilities */
+#define CISTPL_SERIAL_UART_SPACE        0x01
+#define CISTPL_SERIAL_UART_MARK         0x02
+#define CISTPL_SERIAL_UART_ODD          0x04
+#define CISTPL_SERIAL_UART_EVEN         0x08
+#define CISTPL_SERIAL_UART_5BIT         0x01
+#define CISTPL_SERIAL_UART_6BIT         0x02
+#define CISTPL_SERIAL_UART_7BIT         0x04
+#define CISTPL_SERIAL_UART_8BIT         0x08
+#define CISTPL_SERIAL_UART_1STOP        0x10
+#define CISTPL_SERIAL_UART_MSTOP        0x20
+#define CISTPL_SERIAL_UART_2STOP        0x40
+
+typedef struct cistpl_serial_t {
+    u_char      uart_type;
+    u_char      uart_cap_0;
+    u_char      uart_cap_1;
+} cistpl_serial_t;
+
+typedef struct cistpl_modem_cap_t {
+    u_char      flow;
+    u_char      cmd_buf;
+    u_char      rcv_buf_0, rcv_buf_1, rcv_buf_2;
+    u_char      xmit_buf_0, xmit_buf_1, xmit_buf_2;
+} cistpl_modem_cap_t;
+
+#define CISTPL_SERIAL_MOD_103           0x01
+#define CISTPL_SERIAL_MOD_V21           0x02
+#define CISTPL_SERIAL_MOD_V23           0x04
+#define CISTPL_SERIAL_MOD_V22           0x08
+#define CISTPL_SERIAL_MOD_212A          0x10
+#define CISTPL_SERIAL_MOD_V22BIS        0x20
+#define CISTPL_SERIAL_MOD_V26           0x40
+#define CISTPL_SERIAL_MOD_V26BIS        0x80
+#define CISTPL_SERIAL_MOD_V27BIS        0x01
+#define CISTPL_SERIAL_MOD_V29           0x02
+#define CISTPL_SERIAL_MOD_V32           0x04
+#define CISTPL_SERIAL_MOD_V32BIS        0x08
+#define CISTPL_SERIAL_MOD_V34           0x10
+
+#define CISTPL_SERIAL_ERR_MNP2_4        0x01
+#define CISTPL_SERIAL_ERR_V42_LAPM      0x02
+
+#define CISTPL_SERIAL_CMPR_V42BIS       0x01
+#define CISTPL_SERIAL_CMPR_MNP5         0x02
+
+#define CISTPL_SERIAL_CMD_AT1           0x01
+#define CISTPL_SERIAL_CMD_AT2           0x02
+#define CISTPL_SERIAL_CMD_AT3           0x04
+#define CISTPL_SERIAL_CMD_MNP_AT        0x08
+#define CISTPL_SERIAL_CMD_V25BIS        0x10
+#define CISTPL_SERIAL_CMD_V25A          0x20
+#define CISTPL_SERIAL_CMD_DMCL          0x40
+
+typedef struct cistpl_data_serv_t {
+    u_char      max_data_0;
+    u_char      max_data_1;
+    u_char      modulation_0;
+    u_char      modulation_1;
+    u_char      error_control;
+    u_char      compression;
+    u_char      cmd_protocol;
+    u_char      escape;
+    u_char      encrypt;
+    u_char      misc_features;
+    u_char      ccitt_code[0];
+} cistpl_data_serv_t;
+
+typedef struct cistpl_fax_serv_t {
+    u_char      max_data_0;
+    u_char      max_data_1;
+    u_char      modulation;
+    u_char      encrypt;
+    u_char      features_0;
+    u_char      features_1;
+    u_char      ccitt_code[0];
+} cistpl_fax_serv_t;
+
+typedef struct cistpl_voice_serv_t {
+    u_char      max_data_0;
+    u_char      max_data_1;
+} cistpl_voice_serv_t;
+
+/*======================================================================
+
+    LAN Function Extension Tuples
+
+======================================================================*/
+
+#define CISTPL_FUNCE_LAN_TECH           0x01
+#define CISTPL_FUNCE_LAN_SPEED          0x02
+#define CISTPL_FUNCE_LAN_MEDIA          0x03
+#define CISTPL_FUNCE_LAN_NODE_ID        0x04
+#define CISTPL_FUNCE_LAN_CONNECTOR      0x05
+
+/* LAN technologies */
+#define CISTPL_LAN_TECH_ARCNET          0x01
+#define CISTPL_LAN_TECH_ETHERNET        0x02
+#define CISTPL_LAN_TECH_TOKENRING       0x03
+#define CISTPL_LAN_TECH_LOCALTALK       0x04
+#define CISTPL_LAN_TECH_FDDI            0x05
+#define CISTPL_LAN_TECH_ATM             0x06
+#define CISTPL_LAN_TECH_WIRELESS        0x07
+
+typedef struct cistpl_lan_tech_t {
+    u_char      tech;
+} cistpl_lan_tech_t;
+
+typedef struct cistpl_lan_speed_t {
+    u_int       speed;
+} cistpl_lan_speed_t;
+
+/* LAN media definitions */
+#define CISTPL_LAN_MEDIA_UTP            0x01
+#define CISTPL_LAN_MEDIA_STP            0x02
+#define CISTPL_LAN_MEDIA_THIN_COAX      0x03
+#define CISTPL_LAN_MEDIA_THICK_COAX     0x04
+#define CISTPL_LAN_MEDIA_FIBER          0x05
+#define CISTPL_LAN_MEDIA_900MHZ         0x06
+#define CISTPL_LAN_MEDIA_2GHZ           0x07
+#define CISTPL_LAN_MEDIA_5GHZ           0x08
+#define CISTPL_LAN_MEDIA_DIFF_IR        0x09
+#define CISTPL_LAN_MEDIA_PTP_IR         0x0a
+
+typedef struct cistpl_lan_media_t {
+    u_char      media;
+} cistpl_lan_media_t;
+
+typedef struct cistpl_lan_node_id_t {
+    u_char      nb;
+    u_char      id[16];
+} cistpl_lan_node_id_t;
+
+typedef struct cistpl_lan_connector_t {
+    u_char      code;
+} cistpl_lan_connector_t;
+
+/*======================================================================
+
+    IDE Function Extension Tuples
+
+======================================================================*/
+
+#define CISTPL_IDE_INTERFACE            0x01
+
+typedef struct cistpl_ide_interface_t {
+    u_char      interface;
+} cistpl_ide_interface_t;
+
+/* First feature byte */
+#define CISTPL_IDE_SILICON              0x04
+#define CISTPL_IDE_UNIQUE               0x08
+#define CISTPL_IDE_DUAL                 0x10
+
+/* Second feature byte */
+#define CISTPL_IDE_HAS_SLEEP            0x01
+#define CISTPL_IDE_HAS_STANDBY          0x02
+#define CISTPL_IDE_HAS_IDLE             0x04
+#define CISTPL_IDE_LOW_POWER            0x08
+#define CISTPL_IDE_REG_INHIBIT          0x10
+#define CISTPL_IDE_HAS_INDEX            0x20
+#define CISTPL_IDE_IOIS16               0x40
+
+typedef struct cistpl_ide_feature_t {
+    u_char      feature1;
+    u_char      feature2;
+} cistpl_ide_feature_t;
+
+#define CISTPL_FUNCE_IDE_IFACE          0x01
+#define CISTPL_FUNCE_IDE_MASTER         0x02
+#define CISTPL_FUNCE_IDE_SLAVE          0x03
+
+/*======================================================================
+
+    Configuration Table Entries
+
+======================================================================*/
+
+#define CISTPL_BAR_SPACE        0x07
+#define CISTPL_BAR_SPACE_IO     0x10
+#define CISTPL_BAR_PREFETCH     0x20
+#define CISTPL_BAR_CACHEABLE    0x40
+#define CISTPL_BAR_1MEG_MAP     0x80
+
+typedef struct cistpl_bar_t {
+    u_char      attr;
+    u_int       size;
+} cistpl_bar_t;
+
+typedef struct cistpl_config_t {
+    u_char      last_idx;
+    u_int       base;
+    u_int       rmask[4];
+    u_char      subtuples;
+} cistpl_config_t;
+
+/* These are bits in the 'present' field, and indices in 'param' */
+#define CISTPL_POWER_VNOM       0
+#define CISTPL_POWER_VMIN       1
+#define CISTPL_POWER_VMAX       2
+#define CISTPL_POWER_ISTATIC    3
+#define CISTPL_POWER_IAVG       4
+#define CISTPL_POWER_IPEAK      5
+#define CISTPL_POWER_IDOWN      6
+
+#define CISTPL_POWER_HIGHZ_OK   0x01
+#define CISTPL_POWER_HIGHZ_REQ  0x02
+
+typedef struct cistpl_power_t {
+    u_char      present;
+    u_char      flags;
+    u_int       param[7];
+} cistpl_power_t;
+
+typedef struct cistpl_timing_t {
+    u_int       wait, waitscale;
+    u_int       ready, rdyscale;
+    u_int       reserved, rsvscale;
+} cistpl_timing_t;
+
+#define CISTPL_IO_LINES_MASK    0x1f
+#define CISTPL_IO_8BIT          0x20
+#define CISTPL_IO_16BIT         0x40
+#define CISTPL_IO_RANGE         0x80
+
+#define CISTPL_IO_MAX_WIN       16
+
+typedef struct cistpl_io_t {
+    u_char      flags;
+    u_char      nwin;
+    struct {
+        u_int   base;
+        u_int   len;
+    } win[CISTPL_IO_MAX_WIN];
+} cistpl_io_t;
+
+typedef struct cistpl_irq_t {
+    u_int       IRQInfo1;
+    u_int       IRQInfo2;
+} cistpl_irq_t;
+
+#define CISTPL_MEM_MAX_WIN      8
+
+typedef struct cistpl_mem_t {
+    u_char      flags;
+    u_char      nwin;
+    struct {
+        u_int   len;
+        u_int   card_addr;
+        u_int   host_addr;
+    } win[CISTPL_MEM_MAX_WIN];
+} cistpl_mem_t;
+
+#define CISTPL_CFTABLE_DEFAULT          0x0001
+#define CISTPL_CFTABLE_BVDS             0x0002
+#define CISTPL_CFTABLE_WP               0x0004
+#define CISTPL_CFTABLE_RDYBSY           0x0008
+#define CISTPL_CFTABLE_MWAIT            0x0010
+#define CISTPL_CFTABLE_AUDIO            0x0800
+#define CISTPL_CFTABLE_READONLY         0x1000
+#define CISTPL_CFTABLE_PWRDOWN          0x2000
+
+typedef struct cistpl_cftable_entry_t {
+    u_char              index;
+    u_short             flags;
+    u_char              interface;
+    cistpl_power_t      vcc, vpp1, vpp2;
+    cistpl_timing_t     timing;
+    cistpl_io_t         io;
+    cistpl_irq_t        irq;
+    cistpl_mem_t        mem;
+    u_char              subtuples;
+} cistpl_cftable_entry_t;
+
+#define CISTPL_CFTABLE_MASTER           0x000100
+#define CISTPL_CFTABLE_INVALIDATE       0x000200
+#define CISTPL_CFTABLE_VGA_PALETTE      0x000400
+#define CISTPL_CFTABLE_PARITY           0x000800
+#define CISTPL_CFTABLE_WAIT             0x001000
+#define CISTPL_CFTABLE_SERR             0x002000
+#define CISTPL_CFTABLE_FAST_BACK        0x004000
+#define CISTPL_CFTABLE_BINARY_AUDIO     0x010000
+#define CISTPL_CFTABLE_PWM_AUDIO        0x020000
+
+typedef struct cistpl_cftable_entry_cb_t {
+    u_char              index;
+    u_int               flags;
+    cistpl_power_t      vcc, vpp1, vpp2;
+    u_char              io;
+    cistpl_irq_t        irq;
+    u_char              mem;
+    u_char              subtuples;
+} cistpl_cftable_entry_cb_t;
+
+typedef struct cistpl_device_geo_t {
+    u_char              ngeo;
+    struct {
+        u_char          buswidth;
+        u_int           erase_block;
+        u_int           read_block;
+        u_int           write_block;
+        u_int           partition;
+        u_int           interleave;
+    } geo[CISTPL_MAX_DEVICES];
+} cistpl_device_geo_t;
+
+typedef struct cistpl_vers_2_t {
+    u_char      vers;
+    u_char      comply;
+    u_short     dindex;
+    u_char      vspec8, vspec9;
+    u_char      nhdr;
+    u_char      vendor, info;
+    char        str[244];
+} cistpl_vers_2_t;
+
+typedef struct cistpl_org_t {
+    u_char      data_org;
+    char        desc[30];
+} cistpl_org_t;
+
+#define CISTPL_ORG_FS           0x00
+#define CISTPL_ORG_APPSPEC      0x01
+#define CISTPL_ORG_XIP          0x02
+
+typedef struct cistpl_format_t {
+    u_char      type;
+    u_char      edc;
+    u_int       offset;
+    u_int       length;
+} cistpl_format_t;
+
+#define CISTPL_FORMAT_DISK      0x00
+#define CISTPL_FORMAT_MEM       0x01
+
+#define CISTPL_EDC_NONE         0x00
+#define CISTPL_EDC_CKSUM        0x01
+#define CISTPL_EDC_CRC          0x02
+#define CISTPL_EDC_PCC          0x03
+
+typedef union cisparse_t {
+    cistpl_device_t             device;
+    cistpl_checksum_t           checksum;
+    cistpl_longlink_t           longlink;
+    cistpl_longlink_mfc_t       longlink_mfc;
+    cistpl_vers_1_t             version_1;
+    cistpl_altstr_t             altstr;
+    cistpl_jedec_t              jedec;
+    cistpl_manfid_t             manfid;
+    cistpl_funcid_t             funcid;
+    cistpl_funce_t              funce;
+    cistpl_bar_t                bar;
+    cistpl_config_t             config;
+    cistpl_cftable_entry_t      cftable_entry;
+    cistpl_cftable_entry_cb_t   cftable_entry_cb;
+    cistpl_device_geo_t         device_geo;
+    cistpl_vers_2_t             vers_2;
+    cistpl_org_t                org;
+    cistpl_format_t             format;
+} cisparse_t;
+
+typedef struct tuple_t {
+    u_int       Attributes;
+    cisdata_t   DesiredTuple;
+    u_int       Flags;          /* internal use */
+    u_int       LinkOffset;     /* internal use */
+    u_int       CISOffset;      /* internal use */
+    cisdata_t   TupleCode;
+    cisdata_t   TupleLink;
+    cisdata_t   TupleOffset;
+    cisdata_t   TupleDataMax;
+    cisdata_t   TupleDataLen;
+    cisdata_t   *TupleData;
+} tuple_t;
+
+/* Special cisdata_t value */
+#define RETURN_FIRST_TUPLE      0xff
+
+/* Attributes for tuple calls */
+#define TUPLE_RETURN_LINK       0x01
+#define TUPLE_RETURN_COMMON     0x02
+
+/* For ValidateCIS */
+typedef struct cisinfo_t {
+    u_int       Chains;
+} cisinfo_t;
+
+#define CISTPL_MAX_CIS_SIZE     0x200
+
+/* For ReplaceCIS */
+typedef struct cisdump_t {
+    u_int       Length;
+    cisdata_t   Data[CISTPL_MAX_CIS_SIZE];
+} cisdump_t;
+
+int pcmcia_get_first_tuple(client_handle_t handle, tuple_t *tuple);
+int pcmcia_get_next_tuple(client_handle_t handle, tuple_t *tuple);
+int pcmcia_get_tuple_data(client_handle_t handle, tuple_t *tuple);
+int pcmcia_parse_tuple(client_handle_t handle, tuple_t *tuple, cisparse_t *parse);
+
+int pcmcia_validate_cis(client_handle_t handle, cisinfo_t *info);
+int pcmcia_replace_cis(struct pcmcia_socket *s, cisdump_t *cis);
+
+/* don't use outside of PCMCIA core yet */
+int pccard_get_next_tuple(struct pcmcia_socket *s, unsigned int func, tuple_t *tuple);
+int pccard_get_first_tuple(struct pcmcia_socket *s, unsigned int function, tuple_t *tuple);
+int pccard_get_tuple_data(struct pcmcia_socket *s, tuple_t *tuple);
+int pccard_parse_tuple(tuple_t *tuple, cisparse_t *parse);
+
+int pccard_validate_cis(struct pcmcia_socket *s, unsigned int function, cisinfo_t *info);
+
+#endif /* LINUX_CISTPL_H */
diff --git a/include/pcmcia/cs.h b/include/pcmcia/cs.h
new file mode 100644
index 000000000000..8d8643adc786
--- /dev/null
+++ b/include/pcmcia/cs.h
@@ -0,0 +1,427 @@
+/*
+ * cs.h
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * The initial developer of the original code is David A. Hinds
+ * <dahinds@users.sourceforge.net>.  Portions created by David A. Hinds
+ * are Copyright (C) 1999 David A. Hinds.  All Rights Reserved.
+ *
+ * (C) 1999             David A. Hinds
+ */
+
+#ifndef _LINUX_CS_H
+#define _LINUX_CS_H
+
+/* For AccessConfigurationRegister */
+typedef struct conf_reg_t {
+    u_char      Function;
+    u_int       Action;
+    off_t       Offset;
+    u_int       Value;
+} conf_reg_t;
+
+/* Actions */
+#define CS_READ         1
+#define CS_WRITE        2
+
+/* for AdjustResourceInfo */
+typedef struct adjust_t {
+    u_int       Action;
+    u_int       Resource;
+    u_int       Attributes;
+    union {
+        struct memory {
+            u_long      Base;
+            u_long      Size;
+        } memory;
+        struct io {
+            ioaddr_t    BasePort;
+            ioaddr_t    NumPorts;
+            u_int       IOAddrLines;
+        } io;
+        struct irq {
+            u_int       IRQ;
+        } irq;
+    } resource;
+} adjust_t;
+
+/* Action field */
+#define REMOVE_MANAGED_RESOURCE         1
+#define ADD_MANAGED_RESOURCE            2
+#define GET_FIRST_MANAGED_RESOURCE      3
+#define GET_NEXT_MANAGED_RESOURCE       4
+/* Resource field */
+#define RES_MEMORY_RANGE                1
+#define RES_IO_RANGE                    2
+#define RES_IRQ                         3
+/* Attribute field */
+#define RES_IRQ_TYPE                    0x03
+#define RES_IRQ_TYPE_EXCLUSIVE          0
+#define RES_IRQ_TYPE_TIME               1
+#define RES_IRQ_TYPE_DYNAMIC            2
+#define RES_IRQ_CSC                     0x04
+#define RES_SHARED                      0x08
+#define RES_RESERVED                    0x10
+#define RES_ALLOCATED                   0x20
+#define RES_REMOVED                     0x40
+
+typedef struct servinfo_t {
+    char        Signature[2];
+    u_int       Count;
+    u_int       Revision;
+    u_int       CSLevel;
+    char        *VendorString;
+} servinfo_t;
+
+typedef struct event_callback_args_t {
+    client_handle_t client_handle;
+    void        *info;
+    void        *mtdrequest;
+    void        *buffer;
+    void        *misc;
+    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
+#define CV_PIN_REPLACEMENT      0x04
+#define CV_COPY_VALUE           0x08
+#define CV_EXT_STATUS           0x10
+
+/* For GetFirst/NextClient */
+typedef struct client_req_t {
+    socket_t    Socket;
+    u_int       Attributes;
+} client_req_t;
+
+#define CLIENT_THIS_SOCKET      0x01
+
+/* For RegisterClient */
+typedef struct client_reg_t {
+    dev_info_t  *dev_info;
+    u_int       Attributes;  /* UNUSED */
+    u_int       EventMask;
+    int         (*event_handler)(event_t event, int priority,
+                                 event_callback_args_t *);
+    event_callback_args_t event_callback_args;
+    u_int       Version;
+} client_reg_t;
+
+/* ModifyConfiguration */
+typedef struct modconf_t {
+    u_int       Attributes;
+    u_int       Vcc, Vpp1, Vpp2;
+} modconf_t;
+
+/* Attributes for ModifyConfiguration */
+#define CONF_IRQ_CHANGE_VALID   0x100
+#define CONF_VCC_CHANGE_VALID   0x200
+#define CONF_VPP1_CHANGE_VALID  0x400
+#define CONF_VPP2_CHANGE_VALID  0x800
+
+/* For RequestConfiguration */
+typedef struct config_req_t {
+    u_int       Attributes;
+    u_int       Vcc, Vpp1, Vpp2;
+    u_int       IntType;
+    u_int       ConfigBase;
+    u_char      Status, Pin, Copy, ExtStatus;
+    u_char      ConfigIndex;
+    u_int       Present;
+} config_req_t;
+
+/* Attributes for RequestConfiguration */
+#define CONF_ENABLE_IRQ         0x01
+#define CONF_ENABLE_DMA         0x02
+#define CONF_ENABLE_SPKR        0x04
+#define CONF_VALID_CLIENT       0x100
+
+/* IntType field */
+#define INT_MEMORY              0x01
+#define INT_MEMORY_AND_IO       0x02
+#define INT_CARDBUS             0x04
+#define INT_ZOOMED_VIDEO        0x08
+
+/* For RequestIO and ReleaseIO */
+typedef struct io_req_t {
+    ioaddr_t    BasePort1;
+    ioaddr_t    NumPorts1;
+    u_int       Attributes1;
+    ioaddr_t    BasePort2;
+    ioaddr_t    NumPorts2;
+    u_int       Attributes2;
+    u_int       IOAddrLines;
+} io_req_t;
+
+/* Attributes for RequestIO and ReleaseIO */
+#define IO_SHARED               0x01
+#define IO_FIRST_SHARED         0x02
+#define IO_FORCE_ALIAS_ACCESS   0x04
+#define IO_DATA_PATH_WIDTH      0x18
+#define IO_DATA_PATH_WIDTH_8    0x00
+#define IO_DATA_PATH_WIDTH_16   0x08
+#define IO_DATA_PATH_WIDTH_AUTO 0x10
+
+/* For RequestIRQ and ReleaseIRQ */
+typedef struct irq_req_t {
+    u_int       Attributes;
+    u_int       AssignedIRQ;
+    u_int       IRQInfo1, IRQInfo2; /* IRQInfo2 is ignored */
+    void        *Handler;
+    void        *Instance;
+} irq_req_t;
+
+/* Attributes for RequestIRQ and ReleaseIRQ */
+#define IRQ_TYPE                        0x03
+#define IRQ_TYPE_EXCLUSIVE              0x00
+#define IRQ_TYPE_TIME                   0x01
+#define IRQ_TYPE_DYNAMIC_SHARING        0x02
+#define IRQ_FORCED_PULSE                0x04
+#define IRQ_FIRST_SHARED                0x08
+#define IRQ_HANDLE_PRESENT              0x10
+#define IRQ_PULSE_ALLOCATED             0x100
+
+/* Bits in IRQInfo1 field */
+#define IRQ_MASK                0x0f
+#define IRQ_NMI_ID              0x01
+#define IRQ_IOCK_ID             0x02
+#define IRQ_BERR_ID             0x04
+#define IRQ_VEND_ID             0x08
+#define IRQ_INFO2_VALID         0x10
+#define IRQ_LEVEL_ID            0x20
+#define IRQ_PULSE_ID            0x40
+#define IRQ_SHARE_ID            0x80
+
+typedef struct eventmask_t {
+    u_int       Attributes;
+    u_int       EventMask;
+} eventmask_t;
+
+#define CONF_EVENT_MASK_VALID   0x01
+
+/* Configuration registers present */
+#define PRESENT_OPTION          0x001
+#define PRESENT_STATUS          0x002
+#define PRESENT_PIN_REPLACE     0x004
+#define PRESENT_COPY            0x008
+#define PRESENT_EXT_STATUS      0x010
+#define PRESENT_IOBASE_0        0x020
+#define PRESENT_IOBASE_1        0x040
+#define PRESENT_IOBASE_2        0x080
+#define PRESENT_IOBASE_3        0x100
+#define PRESENT_IOSIZE          0x200
+
+/* For GetMemPage, MapMemPage */
+typedef struct memreq_t {
+    u_int       CardOffset;
+    page_t      Page;
+} memreq_t;
+
+/* For ModifyWindow */
+typedef struct modwin_t {
+    u_int       Attributes;
+    u_int       AccessSpeed;
+} modwin_t;
+
+/* For RequestWindow */
+typedef struct win_req_t {
+    u_int       Attributes;
+    u_long      Base;
+    u_int       Size;
+    u_int       AccessSpeed;
+} win_req_t;
+
+/* Attributes for RequestWindow */
+#define WIN_ADDR_SPACE          0x0001
+#define WIN_ADDR_SPACE_MEM      0x0000
+#define WIN_ADDR_SPACE_IO       0x0001
+#define WIN_MEMORY_TYPE         0x0002
+#define WIN_MEMORY_TYPE_CM      0x0000
+#define WIN_MEMORY_TYPE_AM      0x0002
+#define WIN_ENABLE              0x0004
+#define WIN_DATA_WIDTH          0x0018
+#define WIN_DATA_WIDTH_8        0x0000
+#define WIN_DATA_WIDTH_16       0x0008
+#define WIN_DATA_WIDTH_32       0x0010
+#define WIN_PAGED               0x0020
+#define WIN_SHARED              0x0040
+#define WIN_FIRST_SHARED        0x0080
+#define WIN_USE_WAIT            0x0100
+#define WIN_STRICT_ALIGN        0x0200
+#define WIN_MAP_BELOW_1MB       0x0400
+#define WIN_PREFETCH            0x0800
+#define WIN_CACHEABLE           0x1000
+#define WIN_BAR_MASK            0xe000
+#define WIN_BAR_SHIFT           13
+
+/* Attributes for RegisterClient -- UNUSED -- */
+#define INFO_MASTER_CLIENT      0x01
+#define INFO_IO_CLIENT          0x02
+#define INFO_MTD_CLIENT         0x04
+#define INFO_MEM_CLIENT         0x08
+#define MAX_NUM_CLIENTS         3
+
+#define INFO_CARD_SHARE         0x10
+#define INFO_CARD_EXCL          0x20
+
+typedef struct cs_status_t {
+    u_char      Function;
+    event_t     CardState;
+    event_t     SocketState;
+} cs_status_t;
+
+typedef struct error_info_t {
+    int         func;
+    int         retcode;
+} error_info_t;
+
+/* Flag to bind to all functions */
+#define BIND_FN_ALL     0xff
+
+/* Events */
+#define CS_EVENT_PRI_LOW                0
+#define CS_EVENT_PRI_HIGH               1
+
+#define CS_EVENT_WRITE_PROTECT          0x000001
+#define CS_EVENT_CARD_LOCK              0x000002
+#define CS_EVENT_CARD_INSERTION         0x000004
+#define CS_EVENT_CARD_REMOVAL           0x000008
+#define CS_EVENT_BATTERY_DEAD           0x000010
+#define CS_EVENT_BATTERY_LOW            0x000020
+#define CS_EVENT_READY_CHANGE           0x000040
+#define CS_EVENT_CARD_DETECT            0x000080
+#define CS_EVENT_RESET_REQUEST          0x000100
+#define CS_EVENT_RESET_PHYSICAL         0x000200
+#define CS_EVENT_CARD_RESET             0x000400
+#define CS_EVENT_REGISTRATION_COMPLETE  0x000800
+#define CS_EVENT_PM_SUSPEND             0x002000
+#define CS_EVENT_PM_RESUME              0x004000
+#define CS_EVENT_INSERTION_REQUEST      0x008000
+#define CS_EVENT_EJECTION_REQUEST       0x010000
+#define CS_EVENT_MTD_REQUEST            0x020000
+#define CS_EVENT_ERASE_COMPLETE         0x040000
+#define CS_EVENT_REQUEST_ATTENTION      0x080000
+#define CS_EVENT_CB_DETECT              0x100000
+#define CS_EVENT_3VCARD                 0x200000
+#define CS_EVENT_XVCARD                 0x400000
+
+/* Return codes */
+#define CS_SUCCESS              0x00
+#define CS_BAD_ADAPTER          0x01
+#define CS_BAD_ATTRIBUTE        0x02
+#define CS_BAD_BASE             0x03
+#define CS_BAD_EDC              0x04
+#define CS_BAD_IRQ              0x06
+#define CS_BAD_OFFSET           0x07
+#define CS_BAD_PAGE             0x08
+#define CS_READ_FAILURE         0x09
+#define CS_BAD_SIZE             0x0a
+#define CS_BAD_SOCKET           0x0b
+#define CS_BAD_TYPE             0x0d
+#define CS_BAD_VCC              0x0e
+#define CS_BAD_VPP              0x0f
+#define CS_BAD_WINDOW           0x11
+#define CS_WRITE_FAILURE        0x12
+#define CS_NO_CARD              0x14
+#define CS_UNSUPPORTED_FUNCTION 0x15
+#define CS_UNSUPPORTED_MODE     0x16
+#define CS_BAD_SPEED            0x17
+#define CS_BUSY                 0x18
+#define CS_GENERAL_FAILURE      0x19
+#define CS_WRITE_PROTECTED      0x1a
+#define CS_BAD_ARG_LENGTH       0x1b
+#define CS_BAD_ARGS             0x1c
+#define CS_CONFIGURATION_LOCKED 0x1d
+#define CS_IN_USE               0x1e
+#define CS_NO_MORE_ITEMS        0x1f
+#define CS_OUT_OF_RESOURCE      0x20
+#define CS_BAD_HANDLE           0x21
+
+#define CS_BAD_TUPLE            0x40
+
+#ifdef __KERNEL__
+
+/*
+ *  The main Card Services entry point
+ */
+
+enum service {
+    AccessConfigurationRegister, AddSocketServices,
+    AdjustResourceInfo, CheckEraseQueue, CloseMemory, CopyMemory,
+    DeregisterClient, DeregisterEraseQueue, GetCardServicesInfo,
+    GetClientInfo, GetConfigurationInfo, GetEventMask,
+    GetFirstClient, GetFirstPartion, GetFirstRegion, GetFirstTuple,
+    GetNextClient, GetNextPartition, GetNextRegion, GetNextTuple,
+    GetStatus, GetTupleData, MapLogSocket, MapLogWindow, MapMemPage,
+    MapPhySocket, MapPhyWindow, ModifyConfiguration, ModifyWindow,
+    OpenMemory, ParseTuple, ReadMemory, RegisterClient,
+    RegisterEraseQueue, RegisterMTD, RegisterTimer,
+    ReleaseConfiguration, ReleaseExclusive, ReleaseIO, ReleaseIRQ,
+    ReleaseSocketMask, ReleaseWindow, ReplaceSocketServices,
+    RequestConfiguration, RequestExclusive, RequestIO, RequestIRQ,
+    RequestSocketMask, RequestWindow, ResetCard, ReturnSSEntry,
+    SetEventMask, SetRegion, ValidateCIS, VendorSpecific,
+    WriteMemory, BindDevice, BindMTD, ReportError,
+    SuspendCard, ResumeCard, EjectCard, InsertCard, ReplaceCIS,
+    GetFirstWindow, GetNextWindow, GetMemPage
+};
+
+struct pcmcia_socket;
+
+int pcmcia_access_configuration_register(client_handle_t handle, conf_reg_t *reg);
+int pcmcia_deregister_client(client_handle_t handle);
+int pcmcia_get_configuration_info(client_handle_t handle, config_info_t *config);
+int pcmcia_get_card_services_info(servinfo_t *info);
+int pcmcia_get_first_window(window_handle_t *win, win_req_t *req);
+int pcmcia_get_next_window(window_handle_t *win, win_req_t *req);
+int pcmcia_get_status(client_handle_t handle, cs_status_t *status);
+int pcmcia_get_mem_page(window_handle_t win, memreq_t *req);
+int pcmcia_map_mem_page(window_handle_t win, memreq_t *req);
+int pcmcia_modify_configuration(client_handle_t handle, modconf_t *mod);
+int pcmcia_register_client(client_handle_t *handle, client_reg_t *req);
+int pcmcia_release_configuration(client_handle_t handle);
+int pcmcia_release_io(client_handle_t handle, io_req_t *req);
+int pcmcia_release_irq(client_handle_t handle, irq_req_t *req);
+int pcmcia_release_window(window_handle_t win);
+int pcmcia_request_configuration(client_handle_t handle, config_req_t *req);
+int pcmcia_request_io(client_handle_t handle, io_req_t *req);
+int pcmcia_request_irq(client_handle_t handle, irq_req_t *req);
+int pcmcia_request_window(client_handle_t *handle, win_req_t *req, window_handle_t *wh);
+int pcmcia_reset_card(client_handle_t handle, client_req_t *req);
+int pcmcia_suspend_card(struct pcmcia_socket *skt);
+int pcmcia_resume_card(struct pcmcia_socket *skt);
+int pcmcia_eject_card(struct pcmcia_socket *skt);
+int pcmcia_insert_card(struct pcmcia_socket *skt);
+int pcmcia_report_error(client_handle_t handle, error_info_t *err);
+
+struct pcmcia_socket * pcmcia_get_socket(struct pcmcia_socket *skt);
+void pcmcia_put_socket(struct pcmcia_socket *skt);
+
+#endif /* __KERNEL__ */
+
+#endif /* _LINUX_CS_H */
diff --git a/include/pcmcia/cs_types.h b/include/pcmcia/cs_types.h
new file mode 100644
index 000000000000..7881d40aac8d
--- /dev/null
+++ b/include/pcmcia/cs_types.h
@@ -0,0 +1,52 @@
+/*
+ * cs_types.h
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * The initial developer of the original code is David A. Hinds
+ * <dahinds@users.sourceforge.net>.  Portions created by David A. Hinds
+ * are Copyright (C) 1999 David A. Hinds.  All Rights Reserved.
+ *
+ * (C) 1999             David A. Hinds
+ */
+
+#ifndef _LINUX_CS_TYPES_H
+#define _LINUX_CS_TYPES_H
+
+#ifdef __KERNEL__
+#include <linux/types.h>
+#else
+#include <sys/types.h>
+#endif
+
+#if defined(__arm__) || defined(__mips__)
+/* This (ioaddr_t) is exposed to userspace & hence cannot be changed. */
+typedef u_int   ioaddr_t;
+#else
+typedef u_short ioaddr_t;
+#endif
+typedef unsigned long kio_addr_t;
+
+typedef u_short socket_t;
+typedef u_int   event_t;
+typedef u_char  cisdata_t;
+typedef u_short page_t;
+
+struct client_t;
+typedef struct client_t *client_handle_t;
+
+struct window_t;
+typedef struct window_t *window_handle_t;
+
+struct region_t;
+typedef struct region_t *memory_handle_t;
+
+#ifndef DEV_NAME_LEN
+#define DEV_NAME_LEN 32
+#endif
+
+typedef char dev_info_t[DEV_NAME_LEN];
+
+#endif /* _LINUX_CS_TYPES_H */
diff --git a/include/pcmcia/ds.h b/include/pcmcia/ds.h
new file mode 100644
index 000000000000..312fd958c901
--- /dev/null
+++ b/include/pcmcia/ds.h
@@ -0,0 +1,200 @@
+/*
+ * ds.h -- 16-bit PCMCIA core support
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * The initial developer of the original code is David A. Hinds
+ * <dahinds@users.sourceforge.net>.  Portions created by David A. Hinds
+ * are Copyright (C) 1999 David A. Hinds.  All Rights Reserved.
+ *
+ * (C) 1999             David A. Hinds
+ * (C) 2003 - 2004      Dominik Brodowski
+ */
+
+#ifndef _LINUX_DS_H
+#define _LINUX_DS_H
+
+#include <pcmcia/bulkmem.h>
+#include <pcmcia/cs_types.h>
+
+typedef struct tuple_parse_t {
+    tuple_t             tuple;
+    cisdata_t           data[255];
+    cisparse_t          parse;
+} tuple_parse_t;
+
+typedef struct win_info_t {
+    window_handle_t     handle;
+    win_req_t           window;
+    memreq_t            map;
+} win_info_t;
+    
+typedef struct bind_info_t {
+    dev_info_t          dev_info;
+    u_char              function;
+    struct dev_link_t   *instance;
+    char                name[DEV_NAME_LEN];
+    u_short             major, minor;
+    void                *next;
+} bind_info_t;
+
+typedef struct mtd_info_t {
+    dev_info_t          dev_info;
+    u_int               Attributes;
+    u_int               CardOffset;
+} mtd_info_t;
+
+typedef union ds_ioctl_arg_t {
+    servinfo_t          servinfo;
+    adjust_t            adjust;
+    config_info_t       config;
+    tuple_t             tuple;
+    tuple_parse_t       tuple_parse;
+    client_req_t        client_req;
+    cs_status_t         status;
+    conf_reg_t          conf_reg;
+    cisinfo_t           cisinfo;
+    region_info_t       region;
+    bind_info_t         bind_info;
+    mtd_info_t          mtd_info;
+    win_info_t          win_info;
+    cisdump_t           cisdump;
+} ds_ioctl_arg_t;
+
+#define DS_GET_CARD_SERVICES_INFO       _IOR ('d', 1, servinfo_t)
+#define DS_ADJUST_RESOURCE_INFO         _IOWR('d', 2, adjust_t)
+#define DS_GET_CONFIGURATION_INFO       _IOWR('d', 3, config_info_t)
+#define DS_GET_FIRST_TUPLE              _IOWR('d', 4, tuple_t)
+#define DS_GET_NEXT_TUPLE               _IOWR('d', 5, tuple_t)
+#define DS_GET_TUPLE_DATA               _IOWR('d', 6, tuple_parse_t)
+#define DS_PARSE_TUPLE                  _IOWR('d', 7, tuple_parse_t)
+#define DS_RESET_CARD                   _IO  ('d', 8)
+#define DS_GET_STATUS                   _IOWR('d', 9, cs_status_t)
+#define DS_ACCESS_CONFIGURATION_REGISTER _IOWR('d', 10, conf_reg_t)
+#define DS_VALIDATE_CIS                 _IOR ('d', 11, cisinfo_t)
+#define DS_SUSPEND_CARD                 _IO  ('d', 12)
+#define DS_RESUME_CARD                  _IO  ('d', 13)
+#define DS_EJECT_CARD                   _IO  ('d', 14)
+#define DS_INSERT_CARD                  _IO  ('d', 15)
+#define DS_GET_FIRST_REGION             _IOWR('d', 16, region_info_t)
+#define DS_GET_NEXT_REGION              _IOWR('d', 17, region_info_t)
+#define DS_REPLACE_CIS                  _IOWR('d', 18, cisdump_t)
+#define DS_GET_FIRST_WINDOW             _IOR ('d', 19, win_info_t)
+#define DS_GET_NEXT_WINDOW              _IOWR('d', 20, win_info_t)
+#define DS_GET_MEM_PAGE                 _IOWR('d', 21, win_info_t)
+
+#define DS_BIND_REQUEST                 _IOWR('d', 60, bind_info_t)
+#define DS_GET_DEVICE_INFO              _IOWR('d', 61, bind_info_t) 
+#define DS_GET_NEXT_DEVICE              _IOWR('d', 62, bind_info_t) 
+#define DS_UNBIND_REQUEST               _IOW ('d', 63, bind_info_t)
+#define DS_BIND_MTD                     _IOWR('d', 64, mtd_info_t)
+
+#ifdef __KERNEL__
+#include <linux/device.h>
+
+typedef struct dev_node_t {
+    char                dev_name[DEV_NAME_LEN];
+    u_short             major, minor;
+    struct dev_node_t   *next;
+} dev_node_t;
+
+typedef struct dev_link_t {
+    dev_node_t          *dev;
+    u_int               state, open;
+    wait_queue_head_t   pending;
+    client_handle_t     handle;
+    io_req_t            io;
+    irq_req_t           irq;
+    config_req_t        conf;
+    window_handle_t     win;
+    void                *priv;
+    struct dev_link_t   *next;
+} dev_link_t;
+
+/* Flags for device state */
+#define DEV_PRESENT             0x01
+#define DEV_CONFIG              0x02
+#define DEV_STALE_CONFIG        0x04    /* release on close */
+#define DEV_STALE_LINK          0x08    /* detach on release */
+#define DEV_CONFIG_PENDING      0x10
+#define DEV_RELEASE_PENDING     0x20
+#define DEV_SUSPEND             0x40
+#define DEV_BUSY                0x80
+
+#define DEV_OK(l) \
+    ((l) && ((l->state & ~DEV_BUSY) == (DEV_CONFIG|DEV_PRESENT)))
+
+
+struct pcmcia_socket;
+
+extern struct bus_type pcmcia_bus_type;
+
+struct pcmcia_driver {
+        dev_link_t              *(*attach)(void);
+        void                    (*detach)(dev_link_t *);
+        struct module           *owner;
+        struct device_driver    drv;
+};
+
+/* driver registration */
+int pcmcia_register_driver(struct pcmcia_driver *driver);
+void pcmcia_unregister_driver(struct pcmcia_driver *driver);
+
+struct pcmcia_device {
+        /* the socket and the device_no [for multifunction devices]
+           uniquely define a pcmcia_device */
+        struct pcmcia_socket    *socket;
+
+        u8                      device_no;
+
+        /* the hardware "function" device; certain subdevices can
+         * share one hardware "function" device. */
+        u8                      func;
+
+        struct list_head        socket_device_list;
+
+        /* deprecated, a cleaned up version will be moved into this
+           struct soon */
+        dev_link_t              *instance;
+        struct client_t {
+                u_short                 client_magic;
+                struct pcmcia_socket    *Socket;
+                u_char                  Function;
+                u_int                   state;
+                event_t                 EventMask;
+                int (*event_handler)    (event_t event, int priority,
+                                         event_callback_args_t *);
+                event_callback_args_t   event_callback_args;
+        }                       client;
+
+        /* information about this device */
+        u8                      has_manf_id:1;
+        u8                      has_card_id:1;
+        u8                      has_func_id:1;
+        u8                      reserved:5;
+
+        u8                      func_id;
+        u16                     manf_id;
+        u16                     card_id;
+
+        char *                  prod_id[4];
+
+        /* device driver wanted by cardmgr */
+        struct pcmcia_driver *  cardmgr;
+
+        struct device           dev;
+};
+
+#define to_pcmcia_dev(n) container_of(n, struct pcmcia_device, dev)
+#define to_pcmcia_drv(n) container_of(n, struct pcmcia_driver, drv)
+
+#define handle_to_pdev(handle) container_of(handle, struct pcmcia_device, client);
+#define handle_to_dev(handle) ((container_of(handle, struct pcmcia_device, client))->dev)
+
+/* error reporting */
+void cs_error(client_handle_t handle, int func, int ret);
+
+#endif /* __KERNEL__ */
+#endif /* _LINUX_DS_H */
diff --git a/include/pcmcia/mem_op.h b/include/pcmcia/mem_op.h
new file mode 100644
index 000000000000..8d19b9401a5b
--- /dev/null
+++ b/include/pcmcia/mem_op.h
@@ -0,0 +1,116 @@
+/*
+ * mem_op.h
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * The initial developer of the original code is David A. Hinds
+ * <dahinds@users.sourceforge.net>.  Portions created by David A. Hinds
+ * are Copyright (C) 1999 David A. Hinds.  All Rights Reserved.
+ *
+ * (C) 1999             David A. Hinds
+ */
+
+#ifndef _LINUX_MEM_OP_H
+#define _LINUX_MEM_OP_H
+
+#include <asm/uaccess.h>
+#include <asm/io.h>
+
+/*
+   If UNSAFE_MEMCPY is defined, we use the (optimized) system routines
+   to copy between a card and kernel memory.  These routines do 32-bit
+   operations which may not work with all PCMCIA controllers.  The
+   safe versions defined here will do only 8-bit and 16-bit accesses.
+*/
+
+#ifdef UNSAFE_MEMCPY
+
+#define copy_from_pc memcpy_fromio
+#define copy_to_pc memcpy_toio
+
+static inline void copy_pc_to_user(void *to, const void *from, size_t n)
+{
+    size_t odd = (n & 3);
+    n -= odd;
+    while (n) {
+        put_user(__raw_readl(from), (int *)to);
+        (char *)from += 4; (char *)to += 4; n -= 4;
+    }
+    while (odd--)
+        put_user(readb((char *)from++), (char *)to++);
+}
+
+static inline void copy_user_to_pc(void *to, const void *from, size_t n)
+{
+    int l;
+    char c;
+    size_t odd = (n & 3);
+    n -= odd;
+    while (n) {
+        get_user(l, (int *)from);
+        __raw_writel(l, to);
+        (char *)to += 4; (char *)from += 4; n -= 4;
+    }
+    while (odd--) {
+        get_user(c, (char *)from++);
+        writeb(c, (char *)to++);
+    }
+}
+
+#else /* UNSAFE_MEMCPY */
+
+static inline void copy_from_pc(void *to, void __iomem *from, size_t n)
+{
+        __u16 *t = to;
+        __u16 __iomem *f = from;
+        size_t odd = (n & 1);
+        for (n >>= 1; n; n--)
+                *t++ = __raw_readw(f++);
+        if (odd)
+                *(__u8 *)t = readb(f);
+}
+
+static inline void copy_to_pc(void __iomem *to, const void *from, size_t n)
+{
+        __u16 __iomem *t = to;
+        const __u16 *f = from;
+        size_t odd = (n & 1);
+        for (n >>= 1; n ; n--)
+                __raw_writew(*f++, t++);
+        if (odd)
+                writeb(*(__u8 *)f, t);
+}
+
+static inline void copy_pc_to_user(void __user *to, void __iomem *from, size_t n)
+{
+        __u16 __user *t = to;
+        __u16 __iomem *f = from;
+        size_t odd = (n & 1);
+        for (n >>= 1; n ; n--)
+                put_user(__raw_readw(f++), t++);
+        if (odd)
+                put_user(readb(f), (char __user *)t);
+}
+
+static inline void copy_user_to_pc(void __iomem *to, void __user *from, size_t n)
+{
+        __u16 __user *f = from;
+        __u16 __iomem *t = to;
+        short s;
+        char c;
+        size_t odd = (n & 1);
+        for (n >>= 1; n; n--) {
+                get_user(s, f++);
+                __raw_writew(s, t++);
+        }
+        if (odd) {
+                get_user(c, (char __user *)f);
+                writeb(c, t);
+        }
+}
+
+#endif /* UNSAFE_MEMCPY */
+
+#endif /* _LINUX_MEM_OP_H */
diff --git a/include/pcmcia/ss.h b/include/pcmcia/ss.h
new file mode 100644
index 000000000000..6d3413a56708
--- /dev/null
+++ b/include/pcmcia/ss.h
@@ -0,0 +1,265 @@
+/*
+ * ss.h
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * The initial developer of the original code is David A. Hinds
+ * <dahinds@users.sourceforge.net>.  Portions created by David A. Hinds
+ * are Copyright (C) 1999 David A. Hinds.  All Rights Reserved.
+ *
+ * (C) 1999             David A. Hinds
+ */
+
+#ifndef _LINUX_SS_H
+#define _LINUX_SS_H
+
+#include <pcmcia/cs_types.h>
+#include <pcmcia/cs.h>
+#include <pcmcia/bulkmem.h>
+#include <linux/device.h>
+
+/* Definitions for card status flags for GetStatus */
+#define SS_WRPROT       0x0001
+#define SS_CARDLOCK     0x0002
+#define SS_EJECTION     0x0004
+#define SS_INSERTION    0x0008
+#define SS_BATDEAD      0x0010
+#define SS_BATWARN      0x0020
+#define SS_READY        0x0040
+#define SS_DETECT       0x0080
+#define SS_POWERON      0x0100
+#define SS_GPI          0x0200
+#define SS_STSCHG       0x0400
+#define SS_CARDBUS      0x0800
+#define SS_3VCARD       0x1000
+#define SS_XVCARD       0x2000
+#define SS_PENDING      0x4000
+#define SS_ZVCARD       0x8000
+
+/* InquireSocket capabilities */
+#define SS_CAP_PAGE_REGS        0x0001
+#define SS_CAP_VIRTUAL_BUS      0x0002
+#define SS_CAP_MEM_ALIGN        0x0004
+#define SS_CAP_STATIC_MAP       0x0008
+#define SS_CAP_PCCARD           0x4000
+#define SS_CAP_CARDBUS          0x8000
+
+/* for GetSocket, SetSocket */
+typedef struct socket_state_t {
+    u_int       flags;
+    u_int       csc_mask;
+    u_char      Vcc, Vpp;
+    u_char      io_irq;
+} socket_state_t;
+
+extern socket_state_t dead_socket;
+
+/* Socket configuration flags */
+#define SS_PWR_AUTO     0x0010
+#define SS_IOCARD       0x0020
+#define SS_RESET        0x0040
+#define SS_DMA_MODE     0x0080
+#define SS_SPKR_ENA     0x0100
+#define SS_OUTPUT_ENA   0x0200
+
+/* Flags for I/O port and memory windows */
+#define MAP_ACTIVE      0x01
+#define MAP_16BIT       0x02
+#define MAP_AUTOSZ      0x04
+#define MAP_0WS         0x08
+#define MAP_WRPROT      0x10
+#define MAP_ATTRIB      0x20
+#define MAP_USE_WAIT    0x40
+#define MAP_PREFETCH    0x80
+
+/* Use this just for bridge windows */
+#define MAP_IOSPACE     0x20
+
+typedef struct pccard_io_map {
+    u_char      map;
+    u_char      flags;
+    u_short     speed;
+    kio_addr_t  start, stop;
+} pccard_io_map;
+
+typedef struct pccard_mem_map {
+    u_char      map;
+    u_char      flags;
+    u_short     speed;
+    u_long      static_start;
+    u_int       card_start;
+    struct resource *res;
+} pccard_mem_map;
+
+typedef struct cb_bridge_map {
+    u_char      map;
+    u_char      flags;
+    u_int       start, stop;
+} cb_bridge_map;
+
+/*
+ * Socket operations.
+ */
+struct pcmcia_socket;
+
+struct pccard_operations {
+        int (*init)(struct pcmcia_socket *sock);
+        int (*suspend)(struct pcmcia_socket *sock);
+        int (*register_callback)(struct pcmcia_socket *sock, void (*handler)(void *, unsigned int), void * info);
+        int (*get_status)(struct pcmcia_socket *sock, u_int *value);
+        int (*get_socket)(struct pcmcia_socket *sock, socket_state_t *state);
+        int (*set_socket)(struct pcmcia_socket *sock, socket_state_t *state);
+        int (*set_io_map)(struct pcmcia_socket *sock, struct pccard_io_map *io);
+        int (*set_mem_map)(struct pcmcia_socket *sock, struct pccard_mem_map *mem);
+};
+
+struct pccard_resource_ops {
+        void    (*validate_mem)         (struct pcmcia_socket *s);
+        int     (*adjust_io_region)     (struct resource *res,
+                                         unsigned long r_start,
+                                         unsigned long r_end,
+                                         struct pcmcia_socket *s);
+        struct resource* (*find_io)     (unsigned long base, int num,
+                                         unsigned long align,
+                                         struct pcmcia_socket *s);
+        struct resource* (*find_mem)    (unsigned long base, unsigned long num,
+                                         unsigned long align, int low,
+                                         struct pcmcia_socket *s);
+        int     (*adjust_resource)      (struct pcmcia_socket *s,
+                                         adjust_t *adj);
+        int     (*init)                 (struct pcmcia_socket *s);
+        void    (*exit)                 (struct pcmcia_socket *s);
+};
+/* SS_CAP_STATIC_MAP */
+extern struct pccard_resource_ops pccard_static_ops;
+/* !SS_CAP_STATIC_MAP */
+extern struct pccard_resource_ops pccard_nonstatic_ops;
+
+/*
+ *  Calls to set up low-level "Socket Services" drivers
+ */
+struct pcmcia_socket;
+
+typedef struct io_window_t {
+        u_int                   Attributes;
+        kio_addr_t              BasePort, NumPorts;
+        kio_addr_t              InUse, Config;
+        struct resource         *res;
+} io_window_t;
+
+#define WINDOW_MAGIC    0xB35C
+typedef struct window_t {
+        u_short                 magic;
+        u_short                 index;
+        client_handle_t         handle;
+        struct pcmcia_socket    *sock;
+        pccard_mem_map          ctl;
+} window_t;
+
+/* Maximum number of IO windows per socket */
+#define MAX_IO_WIN 2
+
+/* Maximum number of memory windows per socket */
+#define MAX_WIN 4
+
+struct config_t;
+struct pcmcia_callback;
+
+
+struct pcmcia_socket {
+        struct module                   *owner;
+        spinlock_t                      lock;
+        socket_state_t                  socket;
+        u_int                           state;
+        u_short                         functions;
+        u_short                         lock_count;
+        pccard_mem_map                  cis_mem;
+        void __iomem                    *cis_virt;
+        struct config_t                 *config;
+        struct {
+                u_int                   AssignedIRQ;
+                u_int                   Config;
+        } irq;
+        io_window_t                     io[MAX_IO_WIN];
+        window_t                        win[MAX_WIN];
+        struct list_head                cis_cache;
+        u_int                           fake_cis_len;
+        char                            *fake_cis;
+
+        struct list_head                socket_list;
+        struct completion               socket_released;
+
+        /* deprecated */
+        unsigned int                    sock;           /* socket number */
+
+
+        /* socket capabilities */
+        u_int                           features;
+        u_int                           irq_mask;
+        u_int                           map_size;
+        kio_addr_t                      io_offset;
+        u_char                          pci_irq;
+        struct pci_dev *                cb_dev;
+
+
+        /* socket setup is done so resources should be able to be allocated. Only
+         * if set to 1, calls to find_{io,mem}_region are handled, and insertion
+         * events are actually managed by the PCMCIA layer.*/
+        u8                              resource_setup_done:1;
+
+        /* is set to one if resource setup is done using adjust_resource_info() */
+        u8                              resource_setup_old:1;
+
+        u8                              reserved:6;
+
+        /* socket operations */
+        struct pccard_operations *      ops;
+        struct pccard_resource_ops *    resource_ops;
+        void *                          resource_data;
+
+        /* Zoom video behaviour is so chip specific its not worth adding
+           this to _ops */
+        void                            (*zoom_video)(struct pcmcia_socket *, int);
+                           
+        /* state thread */
+        struct semaphore                skt_sem;        /* protects socket h/w state */
+
+        struct task_struct              *thread;
+        struct completion               thread_done;
+        wait_queue_head_t               thread_wait;
+        spinlock_t                      thread_lock;    /* protects thread_events */
+        unsigned int                    thread_events;
+
+        /* pcmcia (16-bit) */
+        struct pcmcia_bus_socket        *pcmcia;
+        struct pcmcia_callback          *callback;
+
+        /* cardbus (32-bit) */
+#ifdef CONFIG_CARDBUS
+        struct resource *               cb_cis_res;
+        void __iomem                    *cb_cis_virt;
+#endif
+
+        /* socket device */
+        struct class_device             dev;
+        void                            *driver_data;   /* data internal to the socket driver */
+
+};
+
+struct pcmcia_socket * pcmcia_get_socket_by_nr(unsigned int nr);
+
+
+
+extern void pcmcia_parse_events(struct pcmcia_socket *socket, unsigned int events);
+extern int pcmcia_register_socket(struct pcmcia_socket *socket);
+extern void pcmcia_unregister_socket(struct pcmcia_socket *socket);
+
+extern struct class pcmcia_socket_class;
+
+/* socket drivers are expected to use these callbacks in their .drv struct */
+extern int pcmcia_socket_dev_suspend(struct device *dev, pm_message_t state);
+extern int pcmcia_socket_dev_resume(struct device *dev);
+
+#endif /* _LINUX_SS_H */
diff --git a/include/pcmcia/version.h b/include/pcmcia/version.h
new file mode 100644
index 000000000000..eb88263fc8d5
--- /dev/null
+++ b/include/pcmcia/version.h
@@ -0,0 +1,4 @@
+/* version.h 1.94 2000/10/03 17:55:48 (David Hinds) */
+
+#define CS_RELEASE "3.1.22"
+#define CS_RELEASE_CODE 0x3116