]> Pileus Git - ~andy/linux/blobdiff - drivers/serial/serial_cs.c
Merge master.kernel.org:/home/rmk/linux-2.6-serial
[~andy/linux] / drivers / serial / serial_cs.c
index 9034f9ad37c7e41c86f1227a1b76cbfa47102638..73a34b18866f405ee8a5d147a42ce9e46108a83d 100644 (file)
@@ -107,6 +107,13 @@ struct serial_info {
        int                     line[4];
 };
 
+struct serial_cfg_mem {
+       tuple_t tuple;
+       cisparse_t parse;
+       u_char buf[256];
+};
+
+
 static void serial_config(dev_link_t * link);
 static int serial_event(event_t event, int priority,
                        event_callback_args_t * args);
@@ -357,14 +364,24 @@ static int simple_config(dev_link_t *link)
        static int size_table[2] = { 8, 16 };
        client_handle_t handle = link->handle;
        struct serial_info *info = link->priv;
-       tuple_t tuple;
-       u_char buf[256];
-       cisparse_t parse;
-       cistpl_cftable_entry_t *cf = &parse.cftable_entry;
+       struct serial_cfg_mem *cfg_mem;
+       tuple_t *tuple;
+       u_char *buf;
+       cisparse_t *parse;
+       cistpl_cftable_entry_t *cf;
        config_info_t config;
        int i, j, try;
        int s;
 
+       cfg_mem = kmalloc(sizeof(struct serial_cfg_mem), GFP_KERNEL);
+       if (!cfg_mem)
+               return -1;
+
+       tuple = &cfg_mem->tuple;
+       parse = &cfg_mem->parse;
+       cf = &parse->cftable_entry;
+       buf = cfg_mem->buf;
+
        /* If the card is already configured, look up the port and irq */
        i = pcmcia_get_configuration_info(handle, &config);
        if ((i == CS_SUCCESS) && (config.Attributes & CONF_VALID_CLIENT)) {
@@ -377,21 +394,23 @@ static int simple_config(dev_link_t *link)
                        port = config.BasePort1 + 0x28;
                        info->slave = 1;
                }
-               if (info->slave)
+               if (info->slave) {
+                       kfree(cfg_mem);
                        return setup_serial(handle, info, port, config.AssignedIRQ);
+               }
        }
        link->conf.Vcc = config.Vcc;
 
        /* First pass: look for a config entry that looks normal. */
-       tuple.TupleData = (cisdata_t *) buf;
-       tuple.TupleOffset = 0;
-       tuple.TupleDataMax = 255;
-       tuple.Attributes = 0;
-       tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
+       tuple->TupleData = (cisdata_t *) buf;
+       tuple->TupleOffset = 0;
+       tuple->TupleDataMax = 255;
+       tuple->Attributes = 0;
+       tuple->DesiredTuple = CISTPL_CFTABLE_ENTRY;
        /* Two tries: without IO aliases, then with aliases */
        for (s = 0; s < 2; s++) {
                for (try = 0; try < 2; try++) {
-                       i = first_tuple(handle, &tuple, &parse);
+                       i = first_tuple(handle, tuple, parse);
                        while (i != CS_NO_MORE_ITEMS) {
                                if (i != CS_SUCCESS)
                                        goto next_entry;
@@ -409,14 +428,14 @@ static int simple_config(dev_link_t *link)
                                                goto found_port;
                                }
 next_entry:
-                               i = next_tuple(handle, &tuple, &parse);
+                               i = next_tuple(handle, tuple, parse);
                        }
                }
        }
        /* Second pass: try to find an entry that isn't picky about
           its base address, then try to grab any standard serial port
           address, and finally try to get any free port. */
-       i = first_tuple(handle, &tuple, &parse);
+       i = first_tuple(handle, tuple, parse);
        while (i != CS_NO_MORE_ITEMS) {
                if ((i == CS_SUCCESS) && (cf->io.nwin > 0) &&
                    ((cf->io.flags & CISTPL_IO_LINES_MASK) <= 3)) {
@@ -429,7 +448,7 @@ next_entry:
                                        goto found_port;
                        }
                }
-               i = next_tuple(handle, &tuple, &parse);
+               i = next_tuple(handle, tuple, parse);
        }
 
       found_port:
@@ -437,6 +456,7 @@ next_entry:
                printk(KERN_NOTICE
                       "serial_cs: no usable port range found, giving up\n");
                cs_error(link->handle, RequestIO, i);
+               kfree(cfg_mem);
                return -1;
        }
 
@@ -450,9 +470,10 @@ next_entry:
        i = pcmcia_request_configuration(link->handle, &link->conf);
        if (i != CS_SUCCESS) {
                cs_error(link->handle, RequestConfiguration, i);
+               kfree(cfg_mem);
                return -1;
        }
-
+       kfree(cfg_mem);
        return setup_serial(handle, info, link->io.BasePort1, link->irq.AssignedIRQ);
 }
 
@@ -460,29 +481,39 @@ static int multi_config(dev_link_t * link)
 {
        client_handle_t handle = link->handle;
        struct serial_info *info = link->priv;
-       tuple_t tuple;
-       u_char buf[256];
-       cisparse_t parse;
-       cistpl_cftable_entry_t *cf = &parse.cftable_entry;
+       struct serial_cfg_mem *cfg_mem;
+       tuple_t *tuple;
+       u_char *buf;
+       cisparse_t *parse;
+       cistpl_cftable_entry_t *cf;
        config_info_t config;
-       int i, base2 = 0;
+       int i, rc, base2 = 0;
+
+       cfg_mem = kmalloc(sizeof(struct serial_cfg_mem), GFP_KERNEL);
+       if (!cfg_mem)
+               return -1;
+       tuple = &cfg_mem->tuple;
+       parse = &cfg_mem->parse;
+       cf = &parse->cftable_entry;
+       buf = cfg_mem->buf;
 
        i = pcmcia_get_configuration_info(handle, &config);
        if (i != CS_SUCCESS) {
                cs_error(handle, GetConfigurationInfo, i);
-               return -1;
+               rc = -1;
+               goto free_cfg_mem;
        }
        link->conf.Vcc = config.Vcc;
 
-       tuple.TupleData = (cisdata_t *) buf;
-       tuple.TupleOffset = 0;
-       tuple.TupleDataMax = 255;
-       tuple.Attributes = 0;
-       tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
+       tuple->TupleData = (cisdata_t *) buf;
+       tuple->TupleOffset = 0;
+       tuple->TupleDataMax = 255;
+       tuple->Attributes = 0;
+       tuple->DesiredTuple = CISTPL_CFTABLE_ENTRY;
 
        /* First, look for a generic full-sized window */
        link->io.NumPorts1 = info->multi * 8;
-       i = first_tuple(handle, &tuple, &parse);
+       i = first_tuple(handle, tuple, parse);
        while (i != CS_NO_MORE_ITEMS) {
                /* The quad port cards have bad CIS's, so just look for a
                   window larger than 8 ports and assume it will be right */
@@ -497,14 +528,14 @@ static int multi_config(dev_link_t * link)
                        if (i == CS_SUCCESS)
                                break;
                }
-               i = next_tuple(handle, &tuple, &parse);
+               i = next_tuple(handle, tuple, parse);
        }
 
        /* If that didn't work, look for two windows */
        if (i != CS_SUCCESS) {
                link->io.NumPorts1 = link->io.NumPorts2 = 8;
                info->multi = 2;
-               i = first_tuple(handle, &tuple, &parse);
+               i = first_tuple(handle, tuple, parse);
                while (i != CS_NO_MORE_ITEMS) {
                        if ((i == CS_SUCCESS) && (cf->io.nwin == 2)) {
                                link->conf.ConfigIndex = cf->index;
@@ -517,13 +548,14 @@ static int multi_config(dev_link_t * link)
                                if (i == CS_SUCCESS)
                                        break;
                        }
-                       i = next_tuple(handle, &tuple, &parse);
+                       i = next_tuple(handle, tuple, parse);
                }
        }
 
        if (i != CS_SUCCESS) {
                cs_error(link->handle, RequestIO, i);
-               return -1;
+               rc = -1;
+               goto free_cfg_mem;
        }
 
        i = pcmcia_request_irq(link->handle, &link->irq);
@@ -541,7 +573,8 @@ static int multi_config(dev_link_t * link)
        i = pcmcia_request_configuration(link->handle, &link->conf);
        if (i != CS_SUCCESS) {
                cs_error(link->handle, RequestConfiguration, i);
-               return -1;
+               rc = -1;
+               goto free_cfg_mem;
        }
 
        /* The Oxford Semiconductor OXCF950 cards are in fact single-port:
@@ -554,17 +587,23 @@ static int multi_config(dev_link_t * link)
                        setup_serial(handle, info, link->io.BasePort1, link->irq.AssignedIRQ);
                        outb(12, base2 + 1);
                }
-               return 0;
+               rc = 0;
+               goto free_cfg_mem;
        }
 
        setup_serial(handle, info, link->io.BasePort1, link->irq.AssignedIRQ);
        /* The Nokia cards are not really multiport cards */
-       if (info->manfid == MANFID_NOKIA)
-               return 0;
+       if (info->manfid == MANFID_NOKIA) {
+               rc = 0;
+               goto free_cfg_mem;
+       }
        for (i = 0; i < info->multi - 1; i++)
-               setup_serial(handle, info, base2 + (8 * i), link->irq.AssignedIRQ);
-
-       return 0;
+               setup_serial(handle, info, base2 + (8 * i),
+                               link->irq.AssignedIRQ);
+       rc = 0;
+free_cfg_mem:
+       kfree(cfg_mem);
+       return rc;
 }
 
 /*======================================================================
@@ -579,43 +618,53 @@ void serial_config(dev_link_t * link)
 {
        client_handle_t handle = link->handle;
        struct serial_info *info = link->priv;
-       tuple_t tuple;
-       u_short buf[128];
-       cisparse_t parse;
-       cistpl_cftable_entry_t *cf = &parse.cftable_entry;
+       struct serial_cfg_mem *cfg_mem;
+       tuple_t *tuple;
+       u_char *buf;
+       cisparse_t *parse;
+       cistpl_cftable_entry_t *cf;
        int i, last_ret, last_fn;
 
        DEBUG(0, "serial_config(0x%p)\n", link);
 
-       tuple.TupleData = (cisdata_t *) buf;
-       tuple.TupleOffset = 0;
-       tuple.TupleDataMax = 255;
-       tuple.Attributes = 0;
+       cfg_mem = kmalloc(sizeof(struct serial_cfg_mem), GFP_KERNEL);
+       if (!cfg_mem)
+               goto failed;
+
+       tuple = &cfg_mem->tuple;
+       parse = &cfg_mem->parse;
+       cf = &parse->cftable_entry;
+       buf = cfg_mem->buf;
+
+       tuple->TupleData = (cisdata_t *) buf;
+       tuple->TupleOffset = 0;
+       tuple->TupleDataMax = 255;
+       tuple->Attributes = 0;
        /* Get configuration register information */
-       tuple.DesiredTuple = CISTPL_CONFIG;
-       last_ret = first_tuple(handle, &tuple, &parse);
+       tuple->DesiredTuple = CISTPL_CONFIG;
+       last_ret = first_tuple(handle, tuple, parse);
        if (last_ret != CS_SUCCESS) {
                last_fn = ParseTuple;
                goto cs_failed;
        }
-       link->conf.ConfigBase = parse.config.base;
-       link->conf.Present = parse.config.rmask[0];
+       link->conf.ConfigBase = parse->config.base;
+       link->conf.Present = parse->config.rmask[0];
 
        /* Configure card */
        link->state |= DEV_CONFIG;
 
        /* Is this a compliant multifunction card? */
-       tuple.DesiredTuple = CISTPL_LONGLINK_MFC;
-       tuple.Attributes = TUPLE_RETURN_COMMON | TUPLE_RETURN_LINK;
-       info->multi = (first_tuple(handle, &tuple, &parse) == CS_SUCCESS);
+       tuple->DesiredTuple = CISTPL_LONGLINK_MFC;
+       tuple->Attributes = TUPLE_RETURN_COMMON | TUPLE_RETURN_LINK;
+       info->multi = (first_tuple(handle, tuple, parse) == CS_SUCCESS);
 
        /* Is this a multiport card? */
-       tuple.DesiredTuple = CISTPL_MANFID;
-       if (first_tuple(handle, &tuple, &parse) == CS_SUCCESS) {
-               info->manfid = le16_to_cpu(buf[0]);
+       tuple->DesiredTuple = CISTPL_MANFID;
+       if (first_tuple(handle, tuple, parse) == CS_SUCCESS) {
+               info->manfid = parse->manfid.manf;
                for (i = 0; i < MULTI_COUNT; i++)
                        if ((info->manfid == multi_id[i].manfid) &&
-                           (le16_to_cpu(buf[1]) == multi_id[i].prodid))
+                           (parse->manfid.card == multi_id[i].prodid))
                                break;
                if (i < MULTI_COUNT)
                        info->multi = multi_id[i].multi;
@@ -623,13 +672,13 @@ void serial_config(dev_link_t * link)
 
        /* Another check for dual-serial cards: look for either serial or
           multifunction cards that ask for appropriate IO port ranges */
-       tuple.DesiredTuple = CISTPL_FUNCID;
+       tuple->DesiredTuple = CISTPL_FUNCID;
        if ((info->multi == 0) &&
-           ((first_tuple(handle, &tuple, &parse) != CS_SUCCESS) ||
-            (parse.funcid.func == CISTPL_FUNCID_MULTI) ||
-            (parse.funcid.func == CISTPL_FUNCID_SERIAL))) {
-               tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
-               if (first_tuple(handle, &tuple, &parse) == CS_SUCCESS) {
+           ((first_tuple(handle, tuple, parse) != CS_SUCCESS) ||
+            (parse->funcid.func == CISTPL_FUNCID_MULTI) ||
+            (parse->funcid.func == CISTPL_FUNCID_SERIAL))) {
+               tuple->DesiredTuple = CISTPL_CFTABLE_ENTRY;
+               if (first_tuple(handle, tuple, parse) == CS_SUCCESS) {
                        if ((cf->io.nwin == 1) && (cf->io.win[0].len % 8 == 0))
                                info->multi = cf->io.win[0].len >> 3;
                        if ((cf->io.nwin == 2) && (cf->io.win[0].len == 8) &&
@@ -664,6 +713,7 @@ void serial_config(dev_link_t * link)
 
        link->dev = &info->node[0];
        link->state &= ~DEV_CONFIG_PENDING;
+       kfree(cfg_mem);
        return;
 
  cs_failed:
@@ -671,6 +721,7 @@ void serial_config(dev_link_t * link)
  failed:
        serial_remove(link);
        link->state &= ~DEV_CONFIG_PENDING;
+       kfree(cfg_mem);
 }
 
 /*======================================================================
@@ -721,6 +772,111 @@ serial_event(event_t event, int priority, event_callback_args_t * args)
        return 0;
 }
 
+static struct pcmcia_device_id serial_ids[] = {
+       PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0057, 0x0021),
+       PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0089, 0x110a),
+       PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0104, 0x000a),
+       PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0105, 0xea15),
+       PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0109, 0x0501),
+       PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0138, 0x110a),
+       PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0140, 0x000a),
+       PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0143, 0x3341),
+       PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0143, 0xc0ab),
+       PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x016c, 0x0081),
+       PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x021b, 0x0101),
+       PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x08a1, 0xc0ab),
+       PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0105, 0x0d0a),
+       PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0105, 0x0e0a),
+       PCMCIA_PFC_DEVICE_PROD_ID123(1, "MEGAHERTZ", "CC/XJEM3288", "DATA/FAX/CELL ETHERNET MODEM", 0xf510db04, 0x04cd2988, 0x46a52d63),
+       PCMCIA_PFC_DEVICE_PROD_ID123(1, "MEGAHERTZ", "CC/XJEM3336", "DATA/FAX/CELL ETHERNET MODEM", 0xf510db04, 0x0143b773, 0x46a52d63),
+       PCMCIA_PFC_DEVICE_PROD_ID123(1, "MEGAHERTZ", "EM1144T", "PCMCIA MODEM", 0xf510db04, 0x856d66c8, 0xbd6c43ef),
+       PCMCIA_PFC_DEVICE_PROD_ID123(1, "MEGAHERTZ", "XJEM1144/CCEM1144", "PCMCIA MODEM", 0xf510db04, 0x52d21e1e, 0xbd6c43ef),
+       PCMCIA_PFC_DEVICE_PROD_ID13(1, "Xircom", "CEM28", 0x2e3ee845, 0x0ea978ea),
+       PCMCIA_PFC_DEVICE_PROD_ID13(1, "Xircom", "CEM33", 0x2e3ee845, 0x80609023),
+       PCMCIA_PFC_DEVICE_PROD_ID13(1, "Xircom", "CEM56", 0x2e3ee845, 0xa650c32a),
+       PCMCIA_PFC_DEVICE_PROD_ID13(1, "Xircom", "REM10", 0x2e3ee845, 0x76df1d29),
+       PCMCIA_PFC_DEVICE_PROD_ID13(1, "Xircom", "XEM5600", 0x2e3ee845, 0xf1403719),
+       PCMCIA_PFC_DEVICE_PROD_ID12(1, "AnyCom", "Fast Ethernet ", 0x578ba6e7, 0x02d92d1e),
+       PCMCIA_PFC_DEVICE_PROD_ID12(1, "D-Link", "DME336T", 0x1a424a1c, 0xb23897ff),
+       PCMCIA_PFC_DEVICE_PROD_ID12(1, "Gateway 2000", "XJEM3336", 0xdd9989be, 0x662c394c),
+       PCMCIA_PFC_DEVICE_PROD_ID12(1, "Grey Cell", "GCS3000", 0x2a151fac, 0x48b932ae),
+       PCMCIA_PFC_DEVICE_PROD_ID12(1, "Linksys", "EtherFast 10&100 + 56K PC Card (PCMLM56)", 0x0733cc81, 0xb3765033),
+       PCMCIA_PFC_DEVICE_PROD_ID12(1, "LINKSYS", "PCMLM336", 0xf7cb0b07, 0x7a821b58),
+       PCMCIA_PFC_DEVICE_PROD_ID12(1, "MEGAHERTZ", "XJEM1144/CCEM1144", 0xf510db04, 0x52d21e1e),
+       PCMCIA_PFC_DEVICE_PROD_ID12(1, "Ositech", "Trumpcard", 0x0c2f80cd, 0x0573c29f),
+       PCMCIA_PFC_DEVICE_PROD_ID12(1, "Ositech", "Trumpcard", 0x0c2f80cd, 0x0573c29f),
+       PCMCIA_PFC_DEVICE_PROD_ID12(1, "PCMCIAs", "ComboCard", 0xdcfe12d3, 0xcd8906cc),
+       PCMCIA_PFC_DEVICE_PROD_ID12(1, "PCMCIAs", "LanModem", 0xdcfe12d3, 0xc67c648f),
+       PCMCIA_PFC_DEVICE_PROD_ID12(1, "TDK", "GlobalNetworker 3410/3412", 0x1eae9475, 0xd9a93bed),
+       PCMCIA_PFC_DEVICE_PROD_ID12(1, "Xircom", "CreditCard Ethernet", 0x2e3ee845, 0xc0e778c2),
+       PCMCIA_MFC_DEVICE_MANF_CARD(0, 0x0104, 0x0070),
+       PCMCIA_MFC_DEVICE_MANF_CARD(1, 0x0101, 0x0562),
+       PCMCIA_MFC_DEVICE_MANF_CARD(1, 0x0104, 0x0070),
+       PCMCIA_MFC_DEVICE_MANF_CARD(1, 0x016c, 0x0020),
+       PCMCIA_MFC_DEVICE_PROD_ID123(1, "APEX DATA", "MULTICARD", "ETHERNET-MODEM", 0x11c2da09, 0x7289dc5d, 0xaad95e1f),
+       PCMCIA_MFC_DEVICE_PROD_ID12(1, "IBM", "Home and Away 28.8 PC Card       ", 0xb569a6e5, 0x5bd4ff2c),
+       PCMCIA_MFC_DEVICE_PROD_ID12(1, "IBM", "Home and Away Credit Card Adapter", 0xb569a6e5, 0x4bdf15c3),
+       PCMCIA_MFC_DEVICE_PROD_ID12(1, "IBM", "w95 Home and Away Credit Card ", 0xb569a6e5, 0xae911c15),
+       PCMCIA_MFC_DEVICE_PROD_ID1(1, "Motorola MARQUIS", 0xf03e4e77),
+       PCMCIA_MFC_DEVICE_PROD_ID2(1, "FAX/Modem/Ethernet Combo Card ", 0x1ed59302),
+       PCMCIA_DEVICE_MANF_CARD(0x0089, 0x0301),
+       PCMCIA_DEVICE_MANF_CARD(0x0101, 0x0039),
+       PCMCIA_DEVICE_MANF_CARD(0x0104, 0x0006),
+       PCMCIA_DEVICE_MANF_CARD(0x0105, 0x410a),
+       PCMCIA_DEVICE_MANF_CARD(0x010b, 0x0d50),
+       PCMCIA_DEVICE_MANF_CARD(0x010b, 0x0d51),
+       PCMCIA_DEVICE_MANF_CARD(0x010b, 0x0d52),
+       PCMCIA_DEVICE_MANF_CARD(0x010b, 0x0d53),
+       PCMCIA_DEVICE_MANF_CARD(0x010b, 0xd180),
+       PCMCIA_DEVICE_MANF_CARD(0x0137, 0x000e),
+       PCMCIA_DEVICE_MANF_CARD(0x0137, 0x001b),
+       PCMCIA_DEVICE_MANF_CARD(0x0137, 0x0025),
+       PCMCIA_DEVICE_MANF_CARD(0x0137, 0x0045),
+       PCMCIA_DEVICE_MANF_CARD(0x0137, 0x0052),
+       PCMCIA_DEVICE_PROD_ID134("ADV", "TECH", "COMpad-32/85", 0x67459937, 0x916d02ba, 0x8fbe92ae),
+       PCMCIA_DEVICE_PROD_ID124("GATEWAY2000", "CC3144", "PCMCIA MODEM", 0x506bccae, 0xcb3685f1, 0xbd6c43ef),
+       PCMCIA_DEVICE_PROD_ID14("MEGAHERTZ", "PCMCIA MODEM", 0xf510db04, 0xbd6c43ef),
+       PCMCIA_DEVICE_PROD_ID124("TOSHIBA", "T144PF", "PCMCIA MODEM", 0xb4585a1a, 0x7271409c, 0xbd6c43ef),
+       PCMCIA_DEVICE_PROD_ID123("FUJITSU", "FC14F ", "MBH10213", 0x6ee5a3d8, 0x30ead12b, 0xb00f05a0),
+       PCMCIA_DEVICE_PROD_ID13("MEGAHERTZ", "V.34 PCMCIA MODEM", 0xf510db04, 0xbb2cce4a),
+       PCMCIA_DEVICE_PROD_ID12("Brain Boxes", "Bluetooth PC Card", 0xee138382, 0xd4ce9b02),
+       PCMCIA_DEVICE_PROD_ID12("CIRRUS LOGIC", "FAX MODEM", 0xe625f451, 0xcecd6dfa),
+       PCMCIA_DEVICE_PROD_ID12("COMPAQ", "PCMCIA 28800 FAX/DATA MODEM", 0xa3a3062c, 0x8cbd7c76),
+       PCMCIA_DEVICE_PROD_ID12("COMPAQ", "PCMCIA 33600 FAX/DATA MODEM", 0xa3a3062c, 0x5a00ce95),
+       PCMCIA_DEVICE_PROD_ID12("Computerboards, Inc.", "PCM-COM422", 0xd0b78f51, 0x7e2d49ed),
+       PCMCIA_DEVICE_PROD_ID12("Dr. Neuhaus", "FURY CARD 14K4", 0x76942813, 0x8b96ce65),
+       PCMCIA_DEVICE_PROD_ID12("Intelligent", "ANGIA FAX/MODEM", 0xb496e65e, 0xf31602a6),
+       PCMCIA_DEVICE_PROD_ID12("Intel", "MODEM 2400", 0x816cc815, 0x23539b80),
+       PCMCIA_DEVICE_PROD_ID12("IOTech Inc ", "PCMCIA Dual RS-232 Serial Port Card", 0x3bd2d898, 0x92abc92f),
+       PCMCIA_DEVICE_PROD_ID12("MACRONIX", "FAX/MODEM", 0x668388b3, 0x3f9bdf2f),
+       PCMCIA_DEVICE_PROD_ID12("Multi-Tech", "MT1432LT", 0x5f73be51, 0x0b3e2383),
+       PCMCIA_DEVICE_PROD_ID12("Multi-Tech", "MT2834LT", 0x5f73be51, 0x4cd7c09e),
+       PCMCIA_DEVICE_PROD_ID12("OEM      ", "C288MX     ", 0xb572d360, 0xd2385b7a),
+       PCMCIA_DEVICE_PROD_ID12("PCMCIA   ", "C336MX     ", 0x99bcafe9, 0xaa25bcab),
+       PCMCIA_DEVICE_PROD_ID12("Quatech Inc", "PCMCIA Dual RS-232 Serial Port Card", 0xc4420b35, 0x92abc92f),
+       PCMCIA_PFC_DEVICE_CIS_PROD_ID12(1, "PCMCIA", "EN2218-LAN/MODEM", 0x281f1c5d, 0x570f348e, "PCMLM28.cis"),
+       PCMCIA_PFC_DEVICE_CIS_PROD_ID12(1, "PCMCIA", "UE2218-LAN/MODEM", 0x281f1c5d, 0x6fdcacee, "PCMLM28.cis"),
+       PCMCIA_PFC_DEVICE_CIS_PROD_ID12(1, "Psion Dacom", "Gold Card V34 Ethernet", 0xf5f025c2, 0x338e8155, "PCMLM28.cis"),
+       PCMCIA_PFC_DEVICE_CIS_PROD_ID12(1, "Psion Dacom", "Gold Card V34 Ethernet GSM", 0xf5f025c2, 0x4ae85d35, "PCMLM28.cis"),
+       PCMCIA_PFC_DEVICE_CIS_PROD_ID12(1, "LINKSYS", "PCMLM28", 0xf7cb0b07, 0x66881874, "PCMLM28.cis"),
+       PCMCIA_MFC_DEVICE_CIS_PROD_ID12(1, "DAYNA COMMUNICATIONS", "LAN AND MODEM MULTIFUNCTION", 0x8fdf8f89, 0xdd5ed9e8, "DP83903.cis"),
+       PCMCIA_MFC_DEVICE_CIS_PROD_ID4(1, "NSC MF LAN/Modem", 0x58fc6056, "DP83903.cis"),
+       PCMCIA_MFC_DEVICE_CIS_MANF_CARD(1, 0x0101, 0x0556, "3CCFEM556.cis"),
+       PCMCIA_MFC_DEVICE_CIS_MANF_CARD(1, 0x0175, 0x0000, "DP83903.cis"),
+       PCMCIA_MFC_DEVICE_CIS_MANF_CARD(1, 0x0101, 0x0035, "3CXEM556.cis"),
+       PCMCIA_MFC_DEVICE_CIS_MANF_CARD(1, 0x0101, 0x003d, "3CXEM556.cis"),
+       PCMCIA_DEVICE_CIS_PROD_ID12("MultiTech", "PCMCIA 56K DataFax", 0x842047ee, 0xc2efcf03, "MT5634ZLX.cis"),
+       PCMCIA_DEVICE_CIS_PROD_ID12("ADVANTECH", "COMpad-32/85B-4", 0x96913a85, 0xcec8f102, "COMpad4.cis"),
+       PCMCIA_DEVICE_CIS_PROD_ID123("ADVANTECH", "COMpad-32/85", "1.0", 0x96913a85, 0x8fbe92ae, 0x0877b627, "COMpad2.cis"),
+       PCMCIA_DEVICE_CIS_PROD_ID2("RS-COM 2P", 0xad20b156, "RS-COM-2P.cis"),
+       /* too generic */
+       /* PCMCIA_MFC_DEVICE_MANF_CARD(0, 0x0160, 0x0002), */
+       /* PCMCIA_MFC_DEVICE_MANF_CARD(1, 0x0160, 0x0002), */
+       PCMCIA_DEVICE_FUNC_ID(2),
+       PCMCIA_DEVICE_NULL,
+};
+MODULE_DEVICE_TABLE(pcmcia, serial_ids);
+
 static struct pcmcia_driver serial_cs_driver = {
        .owner          = THIS_MODULE,
        .drv            = {
@@ -728,6 +884,7 @@ static struct pcmcia_driver serial_cs_driver = {
        },
        .attach         = serial_attach,
        .detach         = serial_detach,
+       .id_table       = serial_ids,
 };
 
 static int __init init_serial_cs(void)