6 files changed, 81 insertions, 74 deletions

diff --git a/include/pcmcia/bulkmem.h b/include/pcmcia/bulkmem.h
index b53b78d497ba..6bc7472293b2 100644
--- a/include/pcmcia/bulkmem.h
+++ b/include/pcmcia/bulkmem.h
@@ -35,7 +35,7 @@ typedef struct region_info_t {
 #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);
+int pcmcia_get_first_region(struct pcmcia_device *handle, region_info_t *rgn);
+int pcmcia_get_next_region(struct pcmcia_device *handle, region_info_t *rgn);
 
 #endif /* _LINUX_BULKMEM_H */
diff --git a/include/pcmcia/ciscode.h b/include/pcmcia/ciscode.h
index da19c297dd65..c1da8558339a 100644
--- a/include/pcmcia/ciscode.h
+++ b/include/pcmcia/ciscode.h
@@ -1,5 +1,5 @@
 /*
- * ciscode.h -- Definitions for bulk memory services
+ * ciscode.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
@@ -122,4 +122,7 @@
 
 #define MANFID_XIRCOM                   0x0105
 
+#define MANFID_POSSIO                   0x030c
+#define PRODID_POSSIO_GCC               0x0003
+
 #endif /* _LINUX_CISCODE_H */
diff --git a/include/pcmcia/cistpl.h b/include/pcmcia/cistpl.h
index c6a069554fd7..d3bbb19caf81 100644
--- a/include/pcmcia/cistpl.h
+++ b/include/pcmcia/cistpl.h
@@ -586,12 +586,7 @@ typedef struct cisdump_t {
     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 */
@@ -602,4 +597,20 @@ int pccard_parse_tuple(tuple_t *tuple, cisparse_t *parse);
 
 int pccard_validate_cis(struct pcmcia_socket *s, unsigned int function, cisinfo_t *info);
 
+/* ... but use these wrappers instead */
+#define pcmcia_get_first_tuple(p_dev, tuple) \
+                pccard_get_first_tuple(p_dev->socket, p_dev->func, tuple)
+
+#define pcmcia_get_next_tuple(p_dev, tuple) \
+                pccard_get_next_tuple(p_dev->socket, p_dev->func, tuple)
+
+#define pcmcia_get_tuple_data(p_dev, tuple) \
+                pccard_get_tuple_data(p_dev->socket, tuple)
+
+#define pcmcia_parse_tuple(p_dev, tuple, parse) \
+                pccard_parse_tuple(tuple, parse)
+
+#define pcmcia_validate_cis(p_dev, info) \
+                pccard_validate_cis(p_dev->socket, p_dev->func, info)
+
 #endif /* LINUX_CISTPL_H */
diff --git a/include/pcmcia/cs.h b/include/pcmcia/cs.h
index 52660f32663d..d5838c30d20f 100644
--- a/include/pcmcia/cs.h
+++ b/include/pcmcia/cs.h
@@ -109,17 +109,6 @@ typedef struct 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;
@@ -127,15 +116,16 @@ typedef struct modconf_t {
 } 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
+#define CONF_IRQ_CHANGE_VALID   0x0100
+#define CONF_VCC_CHANGE_VALID   0x0200
+#define CONF_VPP1_CHANGE_VALID  0x0400
+#define CONF_VPP2_CHANGE_VALID  0x0800
+#define CONF_IO_CHANGE_WIDTH    0x1000
 
 /* For RequestConfiguration */
 typedef struct config_req_t {
     u_int       Attributes;
-    u_int       Vcc, Vpp1, Vpp2;
+    u_int       Vpp; /* both Vpp1 and Vpp2 */
     u_int       IntType;
     u_int       ConfigBase;
     u_char      Status, Pin, Copy, ExtStatus;
@@ -389,23 +379,27 @@ int pcmcia_get_status(struct pcmcia_device *p_dev, 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(struct pcmcia_device *p_dev, modconf_t *mod);
-int pcmcia_release_configuration(struct pcmcia_device *p_dev);
-int pcmcia_release_io(struct pcmcia_device *p_dev, io_req_t *req);
-int pcmcia_release_irq(struct pcmcia_device *p_dev, irq_req_t *req);
 int pcmcia_release_window(window_handle_t win);
 int pcmcia_request_configuration(struct pcmcia_device *p_dev, config_req_t *req);
 int pcmcia_request_io(struct pcmcia_device *p_dev, io_req_t *req);
 int pcmcia_request_irq(struct pcmcia_device *p_dev, irq_req_t *req);
 int pcmcia_request_window(struct pcmcia_device **p_dev, win_req_t *req, window_handle_t *wh);
-int pcmcia_reset_card(struct pcmcia_device *p_dev, 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 pccard_reset_card(struct pcmcia_socket *skt);
+
+struct pcmcia_device * pcmcia_dev_present(struct pcmcia_device *p_dev);
+void pcmcia_disable_device(struct pcmcia_device *p_dev);
 
 struct pcmcia_socket * pcmcia_get_socket(struct pcmcia_socket *skt);
 void pcmcia_put_socket(struct pcmcia_socket *skt);
 
+/* compatibility functions */
+#define pcmcia_reset_card(p_dev, req) \
+                pccard_reset_card(p_dev->socket)
+
 #endif /* __KERNEL__ */
 
 #endif /* _LINUX_CS_H */
diff --git a/include/pcmcia/ds.h b/include/pcmcia/ds.h
index 8e2a96396478..8c339f5678cf 100644
--- a/include/pcmcia/ds.h
+++ b/include/pcmcia/ds.h
@@ -39,7 +39,7 @@ typedef struct win_info_t {
 typedef struct bind_info_t {
     dev_info_t          dev_info;
     u_char              function;
-    struct dev_link_t   *instance;
+    struct pcmcia_device *instance;
     char                name[DEV_NAME_LEN];
     u_short             major, minor;
     void                *next;
@@ -96,6 +96,7 @@ typedef union ds_ioctl_arg_t {
 
 #ifdef __KERNEL__
 #include <linux/device.h>
+#include <pcmcia/ss.h>
 
 typedef struct dev_node_t {
     char                dev_name[DEV_NAME_LEN];
@@ -103,34 +104,9 @@ typedef struct dev_node_t {
     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;
+struct config_t;
 
 struct pcmcia_driver {
         int (*probe)            (struct pcmcia_device *dev);
@@ -148,6 +124,7 @@ struct pcmcia_driver {
 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 */
@@ -160,21 +137,40 @@ struct pcmcia_device {
         /* the hardware "function" device; certain subdevices can
          * share one hardware "function" device. */
         u8                      func;
+        struct config_t*        function_config;
 
         struct list_head        socket_device_list;
 
-        /* deprecated, a cleaned up version will be moved into this
-           struct soon */
-        dev_link_t              *instance;
-        u_int                   state;
+        /* deprecated, will be cleaned up soon */
+        dev_node_t              *dev_node;
+        u_int                   open;
+        io_req_t                io;
+        irq_req_t               irq;
+        config_req_t            conf;
+        window_handle_t         win;
+
+        /* Is the device suspended, or in the process of
+         * being removed? */
+        u16                     suspended:1;
+        u16                     _removed:1;
+
+        /* Flags whether io, irq, win configurations were
+         * requested, and whether the configuration is "locked" */
+        u16                     _irq:1;
+        u16                     _io:1;
+        u16                     _win:4;
+        u16                     _locked:1;
+
+        /* Flag whether a "fuzzy" func_id based match is
+         * allowed. */
+        u16                     allow_func_id_match:1;
 
         /* information about this device */
-        u8                      has_manf_id:1;
-        u8                      has_card_id:1;
-        u8                      has_func_id:1;
+        u16                     has_manf_id:1;
+        u16                     has_card_id:1;
+        u16                     has_func_id:1;
 
-        u8                      allow_func_id_match:1;
-        u8                      reserved:4;
+        u16                     reserved:3;
 
         u8                      func_id;
         u16                     manf_id;
@@ -182,22 +178,24 @@ struct pcmcia_device {
 
         char *                  prod_id[4];
 
+        struct device           dev;
+
+#ifdef CONFIG_PCMCIA_IOCTL
         /* device driver wanted by cardmgr */
         struct pcmcia_driver *  cardmgr;
+#endif
 
-        struct device           dev;
+        /* data private to drivers */
+        void                    *priv;
 };
 
 #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) (handle)
 #define handle_to_dev(handle) (handle->dev)
 
-#define dev_to_instance(dev) (dev->instance)
-
 /* error reporting */
-void cs_error(client_handle_t handle, int func, int ret);
+void cs_error(struct pcmcia_device *handle, int func, int ret);
 
 #endif /* __KERNEL__ */
 #endif /* _LINUX_DS_H */
diff --git a/include/pcmcia/ss.h b/include/pcmcia/ss.h
index 2889a69a7a8f..5e0a01ab2216 100644
--- a/include/pcmcia/ss.h
+++ b/include/pcmcia/ss.h
@@ -18,6 +18,7 @@
 #include <linux/config.h>
 #include <linux/device.h>
 #include <linux/sched.h>        /* task_struct, completion */
+#include <linux/mutex.h>
 
 #include <pcmcia/cs_types.h>
 #include <pcmcia/cs.h>
@@ -146,14 +147,15 @@ extern struct pccard_resource_ops pccard_static_ops;
 /* !SS_CAP_STATIC_MAP */
 extern struct pccard_resource_ops pccard_nonstatic_ops;
 
+/* static mem, dynamic IO sockets */
+extern struct pccard_resource_ops pccard_iodyn_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;
@@ -162,7 +164,7 @@ typedef struct io_window_t {
 typedef struct window_t {
         u_short                 magic;
         u_short                 index;
-        client_handle_t         handle;
+        struct pcmcia_device    *handle;
         struct pcmcia_socket    *sock;
         pccard_mem_map          ctl;
 } window_t;
@@ -186,7 +188,6 @@ struct pcmcia_socket {
         u_short                         lock_count;
         pccard_mem_map                  cis_mem;
         void __iomem                    *cis_virt;
-        struct config_t                 *config;
         struct {
                 u_int                   AssignedIRQ;
                 u_int                   Config;
@@ -241,7 +242,7 @@ struct pcmcia_socket {
 #endif
 
         /* state thread */
-        struct semaphore                skt_sem;        /* protects socket h/w state */
+        struct mutex                    skt_mutex;      /* protects socket h/w state */
 
         struct task_struct              *thread;
         struct completion               thread_done;