PCMCIA changes for compatibility with 2.6.28 kernel.

'CS-SUCCESS' and other special error codes are gone.
'pcmcia_parse_tuple()' now has two arguments, not three.

diff --git a/comedi/drivers/cb_das16_cs.c b/comedi/drivers/cb_das16_cs.c
index 3f4b4ab0809b74d45385999c0d99e7b8f1bb89f1..0ef8e1d9a259c36b62afc82544fb25c6980c7034 100644 (file)
--- a/comedi/drivers/cb_das16_cs.c
+++ b/comedi/drivers/cb_das16_cs.c
@@ -138,8 +138,8 @@ static int get_prodid(comedi_device * dev, struct pcmcia_device *link)
        tuple.TupleDataMax = 255;
        tuple.DesiredTuple = CISTPL_MANFID;
        tuple.Attributes = TUPLE_RETURN_COMMON;
-       if ((pcmcia_get_first_tuple(link, &tuple) == CS_SUCCESS) &&
-               (pcmcia_get_tuple_data(link, &tuple) == CS_SUCCESS)) {
+       if ((pcmcia_get_first_tuple(link, &tuple) == 0) &&
+               (pcmcia_get_tuple_data(link, &tuple) == 0)) {
                prodid = le16_to_cpu(buf[1]);
        }
 
@@ -773,7 +773,7 @@ static void das16cs_pcmcia_config(struct pcmcia_device *link)
        if ((last_ret = pcmcia_get_tuple_data(link, &tuple)) != 0)
                goto cs_failed;
        last_fn = ParseTuple;
-       if ((last_ret = pcmcia_parse_tuple(link, &tuple, &parse)) != 0)
+       if ((last_ret = pcmcia_parse_tuple(&tuple, &parse)) != 0)
                goto cs_failed;
        link->conf.ConfigBase = parse.config.base;
        link->conf.Present = parse.config.rmask[0];
@@ -798,7 +798,7 @@ static void das16cs_pcmcia_config(struct pcmcia_device *link)
                cistpl_cftable_entry_t *cfg = &(parse.cftable_entry);
                if (pcmcia_get_tuple_data(link, &tuple))
                        goto next_entry;
-               if (pcmcia_parse_tuple(link, &tuple, &parse))
+               if (pcmcia_parse_tuple(&tuple, &parse))
                        goto next_entry;
 
                if (cfg->flags & CISTPL_CFTABLE_DEFAULT)

diff --git a/comedi/drivers/das08_cs.c b/comedi/drivers/das08_cs.c
index 93fca06c8df18dcb292a09a4369d645b3c7cccef..d1883807c45bd3d21936ce5e4bb2809b40e8ef73 100644 (file)
--- a/comedi/drivers/das08_cs.c
+++ b/comedi/drivers/das08_cs.c
@@ -271,7 +271,7 @@ static void das08_pcmcia_config(struct pcmcia_device *link)
        if ((last_ret = pcmcia_get_tuple_data(link, &tuple)) != 0)
                goto cs_failed;
        last_fn = ParseTuple;
-       if ((last_ret = pcmcia_parse_tuple(link, &tuple, &parse)) != 0)
+       if ((last_ret = pcmcia_parse_tuple(&tuple, &parse)) != 0)
                goto cs_failed;
        link->conf.ConfigBase = parse.config.base;
        link->conf.Present = parse.config.rmask[0];
@@ -296,7 +296,7 @@ static void das08_pcmcia_config(struct pcmcia_device *link)
                cistpl_cftable_entry_t *cfg = &(parse.cftable_entry);
                if ((last_ret = pcmcia_get_tuple_data(link, &tuple)) != 0)
                        goto next_entry;
-               if ((last_ret = pcmcia_parse_tuple(link, &tuple, &parse)) != 0)
+               if ((last_ret = pcmcia_parse_tuple(&tuple, &parse)) != 0)
                        goto next_entry;
 
                if (cfg->flags & CISTPL_CFTABLE_DEFAULT)

diff --git a/comedi/drivers/ni_daq_700.c b/comedi/drivers/ni_daq_700.c
index e12603ecdfd99afe566e6477e627a2c95a6b2a5a..0e0f2f0722f91f7e31175e23f14380358cb9c2c6 100644 (file)
--- a/comedi/drivers/ni_daq_700.c
+++ b/comedi/drivers/ni_daq_700.c
@@ -601,7 +601,7 @@ static void dio700_config(struct pcmcia_device *link)
                cs_error(link, GetTupleData, last_ret);
                goto cs_failed;
        }
-       if ((last_ret = pcmcia_parse_tuple(link, &tuple, &parse)) != 0) {
+       if ((last_ret = pcmcia_parse_tuple(&tuple, &parse)) != 0) {
                cs_error(link, ParseTuple, last_ret);
                goto cs_failed;
        }
@@ -629,7 +629,7 @@ static void dio700_config(struct pcmcia_device *link)
                cistpl_cftable_entry_t *cfg = &(parse.cftable_entry);
                if (pcmcia_get_tuple_data(link, &tuple) != 0)
                        goto next_entry;
-               if (pcmcia_parse_tuple(link, &tuple, &parse) != 0)
+               if (pcmcia_parse_tuple(&tuple, &parse) != 0)
                        goto next_entry;
 
                if (cfg->flags & CISTPL_CFTABLE_DEFAULT)

diff --git a/comedi/drivers/ni_daq_dio24.c b/comedi/drivers/ni_daq_dio24.c
index 790ecfe026c6ac562efa84c82182511c8f900265..7c3c30dbe56693940ece4fd0ef291b4c2afafb94 100644 (file)
--- a/comedi/drivers/ni_daq_dio24.c
+++ b/comedi/drivers/ni_daq_dio24.c
@@ -358,7 +358,7 @@ static void dio24_config(struct pcmcia_device *link)
                cs_error(link, GetTupleData, last_ret);
                goto cs_failed;
        }
-       if ((last_ret = pcmcia_parse_tuple(link, &tuple, &parse)) != 0) {
+       if ((last_ret = pcmcia_parse_tuple(&tuple, &parse)) != 0) {
                cs_error(link, ParseTuple, last_ret);
                goto cs_failed;
        }
@@ -386,7 +386,7 @@ static void dio24_config(struct pcmcia_device *link)
                cistpl_cftable_entry_t *cfg = &(parse.cftable_entry);
                if (pcmcia_get_tuple_data(link, &tuple) != 0)
                        goto next_entry;
-               if (pcmcia_parse_tuple(link, &tuple, &parse) != 0)
+               if (pcmcia_parse_tuple(&tuple, &parse) != 0)
                        goto next_entry;
 
                if (cfg->flags & CISTPL_CFTABLE_DEFAULT)

diff --git a/comedi/drivers/ni_labpc_cs.c b/comedi/drivers/ni_labpc_cs.c
index 19f900d15441aa0a05a0db5d56b903ff3d154b06..89d452ff0f365f73196df6a48f8375e611b8a619 100644 (file)
--- a/comedi/drivers/ni_labpc_cs.c
+++ b/comedi/drivers/ni_labpc_cs.c
@@ -336,7 +336,7 @@ static void labpc_config(struct pcmcia_device *link)
                cs_error(link, GetTupleData, last_ret);
                goto cs_failed;
        }
-       if ((last_ret = pcmcia_parse_tuple(link, &tuple, &parse))) {
+       if ((last_ret = pcmcia_parse_tuple(&tuple, &parse))) {
                cs_error(link, ParseTuple, last_ret);
                goto cs_failed;
        }
@@ -364,7 +364,7 @@ static void labpc_config(struct pcmcia_device *link)
                cistpl_cftable_entry_t *cfg = &(parse.cftable_entry);
                if (pcmcia_get_tuple_data(link, &tuple))
                        goto next_entry;
-               if (pcmcia_parse_tuple(link, &tuple, &parse))
+               if (pcmcia_parse_tuple(&tuple, &parse))
                        goto next_entry;
 
                if (cfg->flags & CISTPL_CFTABLE_DEFAULT)

diff --git a/comedi/drivers/ni_mio_cs.c b/comedi/drivers/ni_mio_cs.c
index f9cc4164384585bcf49743406462de1cbcf51498..b1a574413344f8caa9f4acf7d178a146e527277d 100644 (file)
--- a/comedi/drivers/ni_mio_cs.c
+++ b/comedi/drivers/ni_mio_cs.c
@@ -326,20 +326,20 @@ static void mio_cs_config(struct pcmcia_device *link)
        tuple.DesiredTuple = CISTPL_CONFIG;
        ret = pcmcia_get_first_tuple(link, &tuple);
        ret = pcmcia_get_tuple_data(link, &tuple);
-       ret = pcmcia_parse_tuple(link, &tuple, &parse);
+       ret = pcmcia_parse_tuple(&tuple, &parse);
        link->conf.ConfigBase = parse.config.base;
        link->conf.Present = parse.config.rmask[0];
 
 #if 0
        tuple.DesiredTuple = CISTPL_LONGLINK_MFC;
        tuple.Attributes = TUPLE_RETURN_COMMON | TUPLE_RETURN_LINK;
-       info->multi(first_tuple(link, &tuple, &parse) == CS_SUCCESS);
+       info->multi(first_tuple(link, &tuple, &parse) == 0);
 #endif
 
        tuple.DesiredTuple = CISTPL_MANFID;
        tuple.Attributes = TUPLE_RETURN_COMMON;
-       if ((pcmcia_get_first_tuple(link, &tuple) == CS_SUCCESS) &&
-               (pcmcia_get_tuple_data(link, &tuple) == CS_SUCCESS)) {
+       if ((pcmcia_get_first_tuple(link, &tuple) == 0) &&
+               (pcmcia_get_tuple_data(link, &tuple) == 0)) {
                manfid = le16_to_cpu(buf[0]);
                prodid = le16_to_cpu(buf[1]);
        }
@@ -349,7 +349,7 @@ static void mio_cs_config(struct pcmcia_device *link)
        tuple.Attributes = 0;
        ret = pcmcia_get_first_tuple(link, &tuple);
        ret = pcmcia_get_tuple_data(link, &tuple);
-       ret = pcmcia_parse_tuple(link, &tuple, &parse);
+       ret = pcmcia_parse_tuple(&tuple, &parse);
 
 #if 0
        printk(" index: 0x%x\n", parse.cftable_entry.index);
@@ -478,8 +478,8 @@ static int get_prodid(comedi_device * dev, struct pcmcia_device *link)
        tuple.TupleDataMax = 255;
        tuple.DesiredTuple = CISTPL_MANFID;
        tuple.Attributes = TUPLE_RETURN_COMMON;
-       if ((pcmcia_get_first_tuple(link, &tuple) == CS_SUCCESS) &&
-               (pcmcia_get_tuple_data(link, &tuple) == CS_SUCCESS)) {
+       if ((pcmcia_get_first_tuple(link, &tuple) == 0) &&
+               (pcmcia_get_tuple_data(link, &tuple) == 0)) {
                prodid = le16_to_cpu(buf[1]);
        }
 

diff --git a/comedi/drivers/quatech_daqp_cs.c b/comedi/drivers/quatech_daqp_cs.c
index 2eb1f976875942cdf25b055add9595d165943788..2e7e71098d6f91a751d677228e6cfd3badadbff9 100644 (file)
--- a/comedi/drivers/quatech_daqp_cs.c
+++ b/comedi/drivers/quatech_daqp_cs.c
@@ -1158,7 +1158,7 @@ static void daqp_cs_config(struct pcmcia_device *link)
                cs_error(link, GetTupleData, last_ret);
                goto cs_failed;
        }
-       if ((last_ret = pcmcia_parse_tuple(link, &tuple, &parse))) {
+       if ((last_ret = pcmcia_parse_tuple(&tuple, &parse))) {
                cs_error(link, ParseTuple, last_ret);
                goto cs_failed;
        }
@@ -1187,7 +1187,7 @@ static void daqp_cs_config(struct pcmcia_device *link)
                cistpl_cftable_entry_t *cfg = &(parse.cftable_entry);
                if (pcmcia_get_tuple_data(link, &tuple))
                        goto next_entry;
-               if (pcmcia_parse_tuple(link, &tuple, &parse))
+               if (pcmcia_parse_tuple(&tuple, &parse))
                        goto next_entry;
 
                if (cfg->flags & CISTPL_CFTABLE_DEFAULT)

diff --git a/include/pcmcia/Makefile.am b/include/pcmcia/Makefile.am
index aacd9f8fa6741c5c8027722c1a95ca45e973bd9e..d393cddcce3b02b0ad1ad503e9add65500bbd4cd 100644 (file)
--- a/include/pcmcia/Makefile.am
+++ b/include/pcmcia/Makefile.am
@@ -1,2 +1,2 @@
 
-noinst_HEADERS=ds.h
+noinst_HEADERS=ds.h cistpl.h

diff --git a/include/pcmcia/cistpl.h b/include/pcmcia/cistpl.h
new file mode 100644 (file)
index 0000000..1053653
--- /dev/null
+++ b/include/pcmcia/cistpl.h
@@ -0,0 +1,18 @@
+/*
+ * pcmcia/cistpl.h compatibility header
+ */
+
+#ifndef __COMPAT_PCMCIA_CISTPL_H_
+#define __COMPAT_PCMCIA_CISTPL_H_
+
+#include_next <pcmcia/cistpl.h>
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28)
+
+/* Redefine pcmcia_parse_tuple() macro to have only 2 params, like 2.6.28. */
+#undef pcmcia_parse_tuple
+#define pcmcia_parse_tuple(tuple, parse) pccard_parse_tuple(tuple, parse)
+
+#endif
+
+#endif // __COMPAT_PCMCIA_CISTPL_H_