5 files changed, 287 insertions, 9 deletions

diff --git a/include/pcmcia/ciscode.h b/include/pcmcia/ciscode.h
index 2000b43ece91..da19c297dd65 100644
--- a/include/pcmcia/ciscode.h
+++ b/include/pcmcia/ciscode.h
@@ -112,6 +112,8 @@
 
 #define MANFID_TDK                      0x0105
 #define PRODID_TDK_CF010                0x0900
+#define PRODID_TDK_NP9610               0x0d0a
+#define PRODID_TDK_MN3200               0x0e0a
 #define PRODID_TDK_GN3410               0x4815
 
 #define MANFID_TOSHIBA                  0x0098
diff --git a/include/pcmcia/cs.h b/include/pcmcia/cs.h
index 8d8643adc786..b42ddc0c1143 100644
--- a/include/pcmcia/cs.h
+++ b/include/pcmcia/cs.h
@@ -396,7 +396,6 @@ 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);
@@ -417,7 +416,6 @@ 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);
diff --git a/include/pcmcia/device_id.h b/include/pcmcia/device_id.h
new file mode 100644
index 000000000000..346d81ece287
--- /dev/null
+++ b/include/pcmcia/device_id.h
@@ -0,0 +1,249 @@
+/*
+ * Copyright (2003-2004)        Dominik Brodowski <linux@brodo.de>
+ *                              David Woodhouse
+ *
+ * License: GPL v2
+ */
+
+#define PCMCIA_DEVICE_MANF_CARD(manf, card) { \
+        .match_flags = PCMCIA_DEV_ID_MATCH_MANF_ID| \
+                        PCMCIA_DEV_ID_MATCH_CARD_ID, \
+        .manf_id = (manf), \
+        .card_id = (card), }
+
+#define PCMCIA_DEVICE_FUNC_ID(func) { \
+        .match_flags = PCMCIA_DEV_ID_MATCH_FUNC_ID, \
+        .func_id = (func), }
+
+#define PCMCIA_DEVICE_PROD_ID1(v1, vh1) { \
+        .match_flags = PCMCIA_DEV_ID_MATCH_PROD_ID1, \
+        .prod_id = { (v1), NULL, NULL, NULL }, \
+        .prod_id_hash = { (vh1), 0, 0, 0 }, }
+
+#define PCMCIA_DEVICE_PROD_ID2(v2, vh2) { \
+        .match_flags = PCMCIA_DEV_ID_MATCH_PROD_ID2, \
+        .prod_id = { NULL, (v2), NULL, NULL },  \
+        .prod_id_hash = { 0, (vh2), 0, 0 }, }
+
+#define PCMCIA_DEVICE_PROD_ID12(v1, v2, vh1, vh2) { \
+        .match_flags = PCMCIA_DEV_ID_MATCH_PROD_ID1| \
+                        PCMCIA_DEV_ID_MATCH_PROD_ID2, \
+        .prod_id = { (v1), (v2), NULL, NULL }, \
+        .prod_id_hash = { (vh1), (vh2), 0, 0 }, }
+
+#define PCMCIA_DEVICE_PROD_ID13(v1, v3, vh1, vh3) { \
+        .match_flags = PCMCIA_DEV_ID_MATCH_PROD_ID1| \
+                        PCMCIA_DEV_ID_MATCH_PROD_ID3, \
+        .prod_id = { (v1), NULL, (v3), NULL }, \
+        .prod_id_hash = { (vh1), 0, (vh3), 0 }, }
+
+#define PCMCIA_DEVICE_PROD_ID14(v1, v4, vh1, vh4) { \
+        .match_flags = PCMCIA_DEV_ID_MATCH_PROD_ID1| \
+                        PCMCIA_DEV_ID_MATCH_PROD_ID4, \
+        .prod_id = { (v1), NULL, NULL, (v4) }, \
+        .prod_id_hash = { (vh1), 0, 0, (vh4) }, }
+
+#define PCMCIA_DEVICE_PROD_ID123(v1, v2, v3, vh1, vh2, vh3) { \
+        .match_flags = PCMCIA_DEV_ID_MATCH_PROD_ID1| \
+                        PCMCIA_DEV_ID_MATCH_PROD_ID2| \
+                        PCMCIA_DEV_ID_MATCH_PROD_ID3, \
+        .prod_id = { (v1), (v2), (v3), NULL },\
+        .prod_id_hash = { (vh1), (vh2), (vh3), 0 }, }
+
+#define PCMCIA_DEVICE_PROD_ID124(v1, v2, v4, vh1, vh2, vh4) { \
+        .match_flags = PCMCIA_DEV_ID_MATCH_PROD_ID1| \
+                        PCMCIA_DEV_ID_MATCH_PROD_ID2| \
+                        PCMCIA_DEV_ID_MATCH_PROD_ID4, \
+        .prod_id = { (v1), (v2), NULL, (v4) }, \
+        .prod_id_hash = { (vh1), (vh2), 0, (vh4) }, }
+
+#define PCMCIA_DEVICE_PROD_ID134(v1, v3, v4, vh1, vh3, vh4) { \
+        .match_flags = PCMCIA_DEV_ID_MATCH_PROD_ID1| \
+                        PCMCIA_DEV_ID_MATCH_PROD_ID3| \
+                        PCMCIA_DEV_ID_MATCH_PROD_ID4, \
+        .prod_id = { (v1), NULL, (v3), (v4) }, \
+        .prod_id_hash = { (vh1), 0, (vh3), (vh4) }, }
+
+#define PCMCIA_DEVICE_PROD_ID1234(v1, v2, v3, v4, vh1, vh2, vh3, vh4) { \
+        .match_flags = PCMCIA_DEV_ID_MATCH_PROD_ID1| \
+                        PCMCIA_DEV_ID_MATCH_PROD_ID2| \
+                        PCMCIA_DEV_ID_MATCH_PROD_ID3| \
+                        PCMCIA_DEV_ID_MATCH_PROD_ID4, \
+        .prod_id = { (v1), (v2), (v3), (v4) }, \
+        .prod_id_hash = { (vh1), (vh2), (vh3), (vh4) }, }
+
+
+/* multi-function devices */
+
+#define PCMCIA_MFC_DEVICE_MANF_CARD(mfc, manf, card) { \
+        .match_flags = PCMCIA_DEV_ID_MATCH_MANF_ID| \
+                        PCMCIA_DEV_ID_MATCH_CARD_ID| \
+                        PCMCIA_DEV_ID_MATCH_FUNCTION, \
+        .manf_id = (manf), \
+        .card_id = (card), \
+        .function = (mfc), }
+
+#define PCMCIA_MFC_DEVICE_PROD_ID1(mfc, v1, vh1) { \
+        .match_flags = PCMCIA_DEV_ID_MATCH_PROD_ID1| \
+                        PCMCIA_DEV_ID_MATCH_FUNCTION, \
+        .prod_id = { (v1), NULL, NULL, NULL }, \
+        .prod_id_hash = { (vh1), 0, 0, 0 }, \
+        .function = (mfc), }
+
+#define PCMCIA_MFC_DEVICE_PROD_ID2(mfc, v2, vh2) { \
+        .match_flags = PCMCIA_DEV_ID_MATCH_PROD_ID2| \
+                        PCMCIA_DEV_ID_MATCH_FUNCTION, \
+        .prod_id = { NULL, (v2), NULL, NULL },  \
+        .prod_id_hash = { 0, (vh2), 0, 0 }, \
+        .function = (mfc), }
+
+#define PCMCIA_MFC_DEVICE_PROD_ID12(mfc, v1, v2, vh1, vh2) { \
+        .match_flags = PCMCIA_DEV_ID_MATCH_PROD_ID1| \
+                        PCMCIA_DEV_ID_MATCH_PROD_ID2| \
+                        PCMCIA_DEV_ID_MATCH_FUNCTION, \
+        .prod_id = { (v1), (v2), NULL, NULL }, \
+        .prod_id_hash = { (vh1), (vh2), 0, 0 }, \
+        .function = (mfc), }
+
+#define PCMCIA_MFC_DEVICE_PROD_ID13(mfc, v1, v3, vh1, vh3) { \
+        .match_flags = PCMCIA_DEV_ID_MATCH_PROD_ID1| \
+                        PCMCIA_DEV_ID_MATCH_PROD_ID3| \
+                        PCMCIA_DEV_ID_MATCH_FUNCTION, \
+        .prod_id = { (v1), NULL, (v3), NULL }, \
+        .prod_id_hash = { (vh1), 0, (vh3), 0 }, \
+        .function = (mfc), }
+
+#define PCMCIA_MFC_DEVICE_PROD_ID123(mfc, v1, v2, v3, vh1, vh2, vh3) { \
+        .match_flags = PCMCIA_DEV_ID_MATCH_PROD_ID1| \
+                        PCMCIA_DEV_ID_MATCH_PROD_ID2| \
+                        PCMCIA_DEV_ID_MATCH_PROD_ID3| \
+                        PCMCIA_DEV_ID_MATCH_FUNCTION, \
+        .prod_id = { (v1), (v2), (v3), NULL },\
+        .prod_id_hash = { (vh1), (vh2), (vh3), 0 }, \
+        .function = (mfc), }
+
+/* pseudo multi-function devices */
+
+#define PCMCIA_PFC_DEVICE_MANF_CARD(mfc, manf, card) { \
+        .match_flags = PCMCIA_DEV_ID_MATCH_MANF_ID| \
+                        PCMCIA_DEV_ID_MATCH_CARD_ID| \
+                        PCMCIA_DEV_ID_MATCH_DEVICE_NO, \
+        .manf_id = (manf), \
+        .card_id = (card), \
+        .device_no = (mfc), }
+
+#define PCMCIA_PFC_DEVICE_PROD_ID1(mfc, v1, vh1) { \
+        .match_flags = PCMCIA_DEV_ID_MATCH_PROD_ID1| \
+                        PCMCIA_DEV_ID_MATCH_DEVICE_NO, \
+        .prod_id = { (v1), NULL, NULL, NULL }, \
+        .prod_id_hash = { (vh1), 0, 0, 0 }, \
+        .device_no = (mfc), }
+
+#define PCMCIA_PFC_DEVICE_PROD_ID2(mfc, v2, vh2) { \
+        .match_flags = PCMCIA_DEV_ID_MATCH_PROD_ID2| \
+                        PCMCIA_DEV_ID_MATCH_DEVICE_NO, \
+        .prod_id = { NULL, (v2), NULL, NULL },  \
+        .prod_id_hash = { 0, (vh2), 0, 0 }, \
+        .device_no = (mfc), }
+
+#define PCMCIA_PFC_DEVICE_PROD_ID12(mfc, v1, v2, vh1, vh2) { \
+        .match_flags = PCMCIA_DEV_ID_MATCH_PROD_ID1| \
+                        PCMCIA_DEV_ID_MATCH_PROD_ID2| \
+                        PCMCIA_DEV_ID_MATCH_DEVICE_NO, \
+        .prod_id = { (v1), (v2), NULL, NULL }, \
+        .prod_id_hash = { (vh1), (vh2), 0, 0 }, \
+        .device_no = (mfc), }
+
+#define PCMCIA_PFC_DEVICE_PROD_ID13(mfc, v1, v3, vh1, vh3) { \
+        .match_flags = PCMCIA_DEV_ID_MATCH_PROD_ID1| \
+                        PCMCIA_DEV_ID_MATCH_PROD_ID3| \
+                        PCMCIA_DEV_ID_MATCH_DEVICE_NO, \
+        .prod_id = { (v1), NULL, (v3), NULL }, \
+        .prod_id_hash = { (vh1), 0, (vh3), 0 }, \
+        .device_no = (mfc), }
+
+#define PCMCIA_PFC_DEVICE_PROD_ID123(mfc, v1, v2, v3, vh1, vh2, vh3) { \
+        .match_flags = PCMCIA_DEV_ID_MATCH_PROD_ID1| \
+                        PCMCIA_DEV_ID_MATCH_PROD_ID2| \
+                        PCMCIA_DEV_ID_MATCH_PROD_ID3| \
+                        PCMCIA_DEV_ID_MATCH_DEVICE_NO, \
+        .prod_id = { (v1), (v2), (v3), NULL },\
+        .prod_id_hash = { (vh1), (vh2), (vh3), 0 }, \
+        .device_no = (mfc), }
+
+/* cards needing a CIS override */
+
+#define PCMCIA_DEVICE_CIS_MANF_CARD(manf, card, _cisfile) { \
+        .match_flags = PCMCIA_DEV_ID_MATCH_FAKE_CIS | \
+                        PCMCIA_DEV_ID_MATCH_MANF_ID| \
+                        PCMCIA_DEV_ID_MATCH_CARD_ID, \
+        .manf_id = (manf), \
+        .card_id = (card), \
+        .cisfile = (_cisfile)}
+
+#define PCMCIA_DEVICE_CIS_PROD_ID12(v1, v2, vh1, vh2, _cisfile) { \
+        .match_flags = PCMCIA_DEV_ID_MATCH_FAKE_CIS | \
+                        PCMCIA_DEV_ID_MATCH_PROD_ID1| \
+                        PCMCIA_DEV_ID_MATCH_PROD_ID2, \
+        .prod_id = { (v1), (v2), NULL, NULL }, \
+        .prod_id_hash = { (vh1), (vh2), 0, 0 }, \
+        .cisfile = (_cisfile)}
+
+#define PCMCIA_DEVICE_CIS_PROD_ID123(v1, v2, v3, vh1, vh2, vh3, _cisfile) { \
+        .match_flags = PCMCIA_DEV_ID_MATCH_FAKE_CIS | \
+                        PCMCIA_DEV_ID_MATCH_PROD_ID1| \
+                        PCMCIA_DEV_ID_MATCH_PROD_ID2| \
+                        PCMCIA_DEV_ID_MATCH_PROD_ID3, \
+        .prod_id = { (v1), (v2), (v3), NULL },\
+        .prod_id_hash = { (vh1), (vh2), (vh3), 0 }, \
+        .cisfile = (_cisfile)}
+
+
+#define PCMCIA_DEVICE_CIS_PROD_ID2(v2, vh2, _cisfile) { \
+        .match_flags =  PCMCIA_DEV_ID_MATCH_FAKE_CIS | \
+                        PCMCIA_DEV_ID_MATCH_PROD_ID2, \
+        .prod_id = { NULL, (v2), NULL, NULL },  \
+        .prod_id_hash = { 0, (vh2), 0, 0 }, \
+        .cisfile = (_cisfile)}
+
+#define PCMCIA_PFC_DEVICE_CIS_PROD_ID12(mfc, v1, v2, vh1, vh2, _cisfile) { \
+        .match_flags =  PCMCIA_DEV_ID_MATCH_FAKE_CIS | \
+                        PCMCIA_DEV_ID_MATCH_PROD_ID1| \
+                        PCMCIA_DEV_ID_MATCH_PROD_ID2| \
+                        PCMCIA_DEV_ID_MATCH_DEVICE_NO, \
+        .prod_id = { (v1), (v2), NULL, NULL }, \
+        .prod_id_hash = { (vh1), (vh2), 0, 0 },\
+        .device_no = (mfc), \
+        .cisfile = (_cisfile)}
+
+#define PCMCIA_MFC_DEVICE_CIS_MANF_CARD(mfc, manf, card, _cisfile) { \
+        .match_flags =  PCMCIA_DEV_ID_MATCH_FAKE_CIS | \
+                        PCMCIA_DEV_ID_MATCH_MANF_ID| \
+                        PCMCIA_DEV_ID_MATCH_CARD_ID| \
+                        PCMCIA_DEV_ID_MATCH_FUNCTION, \
+        .manf_id = (manf), \
+        .card_id = (card), \
+        .function = (mfc), \
+        .cisfile = (_cisfile)}
+
+#define PCMCIA_MFC_DEVICE_CIS_PROD_ID12(mfc, v1, v2, vh1, vh2, _cisfile) { \
+        .match_flags =  PCMCIA_DEV_ID_MATCH_FAKE_CIS | \
+                        PCMCIA_DEV_ID_MATCH_PROD_ID1| \
+                        PCMCIA_DEV_ID_MATCH_PROD_ID2| \
+                        PCMCIA_DEV_ID_MATCH_FUNCTION, \
+        .prod_id = { (v1), (v2), NULL, NULL }, \
+        .prod_id_hash = { (vh1), (vh2), 0, 0 }, \
+        .function = (mfc), \
+        .cisfile = (_cisfile)}
+
+#define PCMCIA_MFC_DEVICE_CIS_PROD_ID4(mfc, v4, vh4, _cisfile) { \
+        .match_flags =  PCMCIA_DEV_ID_MATCH_FAKE_CIS | \
+                        PCMCIA_DEV_ID_MATCH_PROD_ID4| \
+                        PCMCIA_DEV_ID_MATCH_FUNCTION, \
+        .prod_id = { NULL, NULL, NULL, (v4) }, \
+        .prod_id_hash = { 0, 0, 0, (vh4) }, \
+        .function = (mfc), \
+        .cisfile = (_cisfile)}
+
+
+#define PCMCIA_DEVICE_NULL { .match_flags = 0, }
diff --git a/include/pcmcia/ds.h b/include/pcmcia/ds.h
index 312fd958c901..2b52553f2d94 100644
--- a/include/pcmcia/ds.h
+++ b/include/pcmcia/ds.h
@@ -18,6 +18,8 @@
 
 #include <pcmcia/bulkmem.h>
 #include <pcmcia/cs_types.h>
+#include <pcmcia/device_id.h>
+#include <linux/mod_devicetable.h>
 
 typedef struct tuple_parse_t {
     tuple_t             tuple;
@@ -129,12 +131,11 @@ typedef struct dev_link_t {
 
 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 pcmcia_device_id *id_table;
         struct device_driver    drv;
 };
 
@@ -173,7 +174,9 @@ struct pcmcia_device {
         u8                      has_manf_id:1;
         u8                      has_card_id:1;
         u8                      has_func_id:1;
-        u8                      reserved:5;
+
+        u8                      allow_func_id_match:1;
+        u8                      reserved:4;
 
         u8                      func_id;
         u16                     manf_id;
diff --git a/include/pcmcia/ss.h b/include/pcmcia/ss.h
index 67b867f31fe4..0f7aacc33fe9 100644
--- a/include/pcmcia/ss.h
+++ b/include/pcmcia/ss.h
@@ -15,10 +15,12 @@
 #ifndef _LINUX_SS_H
 #define _LINUX_SS_H
 
+#include <linux/config.h>
+#include <linux/device.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
@@ -171,7 +173,7 @@ typedef struct window_t {
 
 struct config_t;
 struct pcmcia_callback;
-
+struct user_info_t;
 
 struct pcmcia_socket {
         struct module                   *owner;
@@ -216,8 +218,9 @@ struct pcmcia_socket {
 
         /* is set to one if resource setup is done using adjust_resource_info() */
         u8                              resource_setup_old:1;
+        u8                              resource_setup_new:1;
 
-        u8                              reserved:6;
+        u8                              reserved:5;
 
         /* socket operations */
         struct pccard_operations *      ops;
@@ -241,9 +244,32 @@ struct pcmcia_socket {
         unsigned int                    thread_events;
 
         /* pcmcia (16-bit) */
-        struct pcmcia_bus_socket        *pcmcia;
         struct pcmcia_callback          *callback;
 
+#if defined(CONFIG_PCMCIA) || defined(CONFIG_PCMCIA_MODULE)
+        struct list_head                devices_list;   /*  PCMCIA devices */
+        u8                              device_count;   /* the number of devices, used
+                                                         * only internally and subject
+                                                         * to incorrectness and change */
+
+        struct {
+                u8                      present:1,      /* PCMCIA card is present in socket */
+                                        busy:1,         /* "master" ioctl is used */
+                                        dead:1,         /* pcmcia module is being unloaded */
+                                        device_add_pending:1, /* a pseudo-multifunction-device
+                                                               * add event is pending */
+                                        reserved:4;
+        }                               pcmcia_state;
+
+        struct work_struct              device_add;     /* for adding further pseudo-multifunction
+                                                         * devices */
+
+#ifdef CONFIG_PCMCIA_IOCTL
+        struct user_info_t              *user;
+        wait_queue_head_t               queue;
+#endif
+#endif
+
         /* cardbus (32-bit) */
 #ifdef CONFIG_CARDBUS
         struct resource *               cb_cis_res;