5 files changed, 53 insertions, 87 deletions

diff --git a/include/pcmcia/cs.h b/include/pcmcia/cs.h
index 904468a191ef..75fa3530345b 100644
--- a/include/pcmcia/cs.h
+++ b/include/pcmcia/cs.h
@@ -15,6 +15,10 @@
 #ifndef _LINUX_CS_H
 #define _LINUX_CS_H
 
+#ifdef __KERNEL__
+#include <linux/interrupt.h>
+#endif
+
 /* For AccessConfigurationRegister */
 typedef struct conf_reg_t {
     u_char      Function;
@@ -111,11 +115,9 @@ typedef struct io_req_t {
 
 /* 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;
+        u_int           Attributes;
+        u_int           AssignedIRQ;
+        irq_handler_t   Handler;
 } irq_req_t;
 
 /* Attributes for RequestIRQ and ReleaseIRQ */
@@ -124,8 +126,8 @@ typedef struct irq_req_t {
 #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_FIRST_SHARED                0x08 /* unused */
+#define IRQ_HANDLE_PRESENT              0x10 /* unused */
 #define IRQ_PULSE_ALLOCATED             0x100
 
 /* Bits in IRQInfo1 field */
diff --git a/include/pcmcia/cs_types.h b/include/pcmcia/cs_types.h
index 315965a37930..f5e3b8386c8f 100644
--- a/include/pcmcia/cs_types.h
+++ b/include/pcmcia/cs_types.h
@@ -26,8 +26,7 @@ typedef u_int	event_t;
 typedef u_char  cisdata_t;
 typedef u_short page_t;
 
-struct window_t;
-typedef struct window_t *window_handle_t;
+typedef unsigned long window_handle_t;
 
 struct region_t;
 typedef struct region_t *memory_handle_t;
diff --git a/include/pcmcia/ds.h b/include/pcmcia/ds.h
index a2be80b9a095..ee148573c114 100644
--- a/include/pcmcia/ds.h
+++ b/include/pcmcia/ds.h
@@ -34,6 +34,7 @@
 struct pcmcia_socket;
 struct pcmcia_device;
 struct config_t;
+struct net_device;
 
 /* dynamic device IDs for PCMCIA device drivers. See
  * Documentation/pcmcia/driver.txt for details.
@@ -81,7 +82,7 @@ struct pcmcia_device {
         /* the hardware "function" device; certain subdevices can
          * share one hardware "function" device. */
         u8                      func;
-        struct config_t*        function_config;
+        struct config_t         *function_config;
 
         struct list_head        socket_device_list;
 
@@ -120,14 +121,14 @@ struct pcmcia_device {
         u16                     manf_id;
         u16                     card_id;
 
-        char *                  prod_id[4];
+        char                    *prod_id[4];
 
         u64                     dma_mask;
         struct device           dev;
 
 #ifdef CONFIG_PCMCIA_IOCTL
         /* device driver wanted by cardmgr */
-        struct pcmcia_driver *  cardmgr;
+        struct pcmcia_driver    *cardmgr;
 #endif
 
         /* data private to drivers */
@@ -137,65 +138,39 @@ struct pcmcia_device {
 #define to_pcmcia_dev(n) container_of(n, struct pcmcia_device, dev)
 #define to_pcmcia_drv(n) container_of(n, struct pcmcia_driver, drv)
 
-/* deprecated -- don't use! */
-#define handle_to_dev(handle) (handle->dev)
 
-
-/* (deprecated) error reporting by PCMCIA devices. Use dev_printk()
- * or dev_dbg() directly in the driver, without referring to pcmcia_error_func()
- * and/or pcmcia_error_ret() for those functions will go away soon.
- */
-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
-};
-const char *pcmcia_error_func(int func);
-const char *pcmcia_error_ret(int ret);
-
-#define cs_error(p_dev, func, ret)                      \
-        {                                               \
-                dev_printk(KERN_NOTICE, &p_dev->dev,    \
-                           "%s : %s\n",                 \
-                           pcmcia_error_func(func),     \
-                           pcmcia_error_ret(ret));      \
-        }
-
-/* CIS access.
- * Use the pcmcia_* versions in PCMCIA drivers
+/*
+ * CIS access.
+ *
+ * Please use the following functions to access CIS tuples:
+ * - pcmcia_get_tuple()
+ * - pcmcia_loop_tuple()
+ * - pcmcia_get_mac_from_cis()
+ *
+ * To parse a tuple_t, pcmcia_parse_tuple() exists. Its interface
+ * might change in future.
  */
-int pcmcia_parse_tuple(tuple_t *tuple, cisparse_t *parse);
 
-int pccard_get_first_tuple(struct pcmcia_socket *s, unsigned int function,
-                           tuple_t *tuple);
-#define pcmcia_get_first_tuple(p_dev, tuple) \
-                pccard_get_first_tuple(p_dev->socket, p_dev->func, tuple)
+/* get the very first CIS entry of type @code. Note that buf is pointer
+ * to u8 *buf; and that you need to kfree(buf) afterwards. */
+size_t pcmcia_get_tuple(struct pcmcia_device *p_dev, cisdata_t code,
+                        u8 **buf);
 
-int pccard_get_next_tuple(struct pcmcia_socket *s, unsigned int function,
-                          tuple_t *tuple);
-#define pcmcia_get_next_tuple(p_dev, tuple) \
-                pccard_get_next_tuple(p_dev->socket, p_dev->func, tuple)
+/* loop over CIS entries */
+int pcmcia_loop_tuple(struct pcmcia_device *p_dev, cisdata_t code,
+                      int (*loop_tuple) (struct pcmcia_device *p_dev,
+                                         tuple_t *tuple,
+                                         void *priv_data),
+                      void *priv_data);
 
-int pccard_get_tuple_data(struct pcmcia_socket *s, tuple_t *tuple);
-#define pcmcia_get_tuple_data(p_dev, tuple) \
-                pccard_get_tuple_data(p_dev->socket, tuple)
+/* get the MAC address from CISTPL_FUNCE */
+int pcmcia_get_mac_from_cis(struct pcmcia_device *p_dev,
+                            struct net_device *dev);
 
 
+/* parse a tuple_t */
+int pcmcia_parse_tuple(tuple_t *tuple, cisparse_t *parse);
+
 /* loop CIS entries for valid configuration */
 int pcmcia_loop_config(struct pcmcia_device *p_dev,
                        int      (*conf_check)   (struct pcmcia_device *p_dev,
@@ -221,12 +196,11 @@ int pcmcia_request_irq(struct pcmcia_device *p_dev, irq_req_t *req);
 int pcmcia_request_configuration(struct pcmcia_device *p_dev,
                                  config_req_t *req);
 
-int pcmcia_request_window(struct pcmcia_device **p_dev, win_req_t *req,
+int pcmcia_request_window(struct pcmcia_device *p_dev, win_req_t *req,
                           window_handle_t *wh);
-int pcmcia_release_window(window_handle_t win);
-
-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_release_window(struct pcmcia_device *p_dev, window_handle_t win);
+int pcmcia_map_mem_page(struct pcmcia_device *p_dev, window_handle_t win,
+                        memreq_t *req);
 
 int pcmcia_modify_configuration(struct pcmcia_device *p_dev, modconf_t *mod);
 void pcmcia_disable_device(struct pcmcia_device *p_dev);
diff --git a/include/pcmcia/mem_op.h b/include/pcmcia/mem_op.h
index 8d19b9401a5b..0fa06e5d5376 100644
--- a/include/pcmcia/mem_op.h
+++ b/include/pcmcia/mem_op.h
@@ -15,8 +15,8 @@
 #ifndef _LINUX_MEM_OP_H
 #define _LINUX_MEM_OP_H
 
+#include <linux/io.h>
 #include <asm/uaccess.h>
-#include <asm/io.h>
 
 /*
    If UNSAFE_MEMCPY is defined, we use the (optimized) system routines
diff --git a/include/pcmcia/ss.h b/include/pcmcia/ss.h
index e0f6feb8588c..cbfba885eb85 100644
--- a/include/pcmcia/ss.h
+++ b/include/pcmcia/ss.h
@@ -107,15 +107,6 @@ typedef struct io_window_t {
         struct resource         *res;
 } io_window_t;
 
-#define WINDOW_MAGIC    0xB35C
-typedef struct window_t {
-        u_short                 magic;
-        u_short                 index;
-        struct pcmcia_device    *handle;
-        struct pcmcia_socket    *sock;
-        pccard_mem_map          ctl;
-} window_t;
-
 /* Maximum number of IO windows per socket */
 #define MAX_IO_WIN 2
 
@@ -155,7 +146,7 @@ struct pcmcia_socket {
                 u_int                   Config;
         } irq;
         io_window_t                     io[MAX_IO_WIN];
-        window_t                        win[MAX_WIN];
+        pccard_mem_map                  win[MAX_WIN];
         struct list_head                cis_cache;
         size_t                          fake_cis_len;
         u8                              *fake_cis;
@@ -163,7 +154,7 @@ struct pcmcia_socket {
         struct list_head                socket_list;
         struct completion               socket_released;
 
-        /* deprecated */
+        /* deprecated */
         unsigned int                    sock;           /* socket number */
 
 
@@ -172,8 +163,8 @@ struct pcmcia_socket {
         u_int                           irq_mask;
         u_int                           map_size;
         u_int                           io_offset;
-        u_char                          pci_irq;
-        struct pci_dev *                cb_dev;
+        u_int                           pci_irq;
+        struct pci_dev                  *cb_dev;
 
 
         /* socket setup is done so resources should be able to be allocated.
@@ -188,9 +179,9 @@ struct pcmcia_socket {
         u8                              reserved:5;
 
         /* socket operations */
-        struct pccard_operations *      ops;
-        struct pccard_resource_ops *    resource_ops;
-        void *                          resource_data;
+        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 */
@@ -254,7 +245,7 @@ struct pcmcia_socket {
 
         /* cardbus (32-bit) */
 #ifdef CONFIG_CARDBUS
-        struct resource *               cb_cis_res;
+        struct resource                 *cb_cis_res;
         void __iomem                    *cb_cis_virt;
 #endif /* CONFIG_CARDBUS */