New driver from Michal Dobes

diff --git a/Contributors b/Contributors
index 7b266e8b18f2b5f4903e835a288835b5c4a5e0b6..5ff00c99c1874dc55382d3e476bb181e202ae7de 100644 (file)
--- a/Contributors
+++ b/Contributors
@@ -1,4 +1,4 @@
-Michal Dobes <majkl@tesnet.cz>
+Michal Dobes <dobes@tesnet.cz>
 Jochen Küpper <jochen@pc1.uni-duesseldorf.de>
 Oystein Svendsen <svendsen@pvv.org>
 Frank Mori Hess <fmhess@users.sourceforge.net>

diff --git a/Documentation/Configure.help b/Documentation/Configure.help
index 59566d8e0bd8f9fe173ec47b37841ad70960e75e..a0b685267048c9c4ffdfb2b7e400a510d36a30a5 100644 (file)
--- a/Documentation/Configure.help
+++ b/Documentation/Configure.help
@@ -189,7 +189,18 @@ CONFIG_COMEDI_ADV_PCI1710
      Advantech PCI-1713
      Advantech PCI-1720
      Advantech PCI-1731
-     
+
+Advantech PCI-173x/175x/176x DIO cards
+CONFIG_COMEDI_ADV_PCI_DIO
+  Includes support for these cards:
+     Advantech PCI-1730, PCI-1733, PCI-1734
+     Advantech PCI-1750
+     Advantech PCI-1751, PCI-1753, PCI-1753+PCI-1753E,
+     Advantech PCI-1752, PCI-1754, PCI-1756
+     Advantech PCI-1760
+     Advantech PCI-1762
+ For the PCI-1751/3/3E cards you also need select the generic 8255 driver.
+
 PCL 711 driver
 CONFIG_COMEDI_PCL711
   Includes support for PCL 711, 711b and ACL 8112.

diff --git a/Documentation/Configure.help.append b/Documentation/Configure.help.append
index 59566d8e0bd8f9fe173ec47b37841ad70960e75e..a0b685267048c9c4ffdfb2b7e400a510d36a30a5 100644 (file)
--- a/Documentation/Configure.help.append
+++ b/Documentation/Configure.help.append
@@ -189,7 +189,18 @@ CONFIG_COMEDI_ADV_PCI1710
      Advantech PCI-1713
      Advantech PCI-1720
      Advantech PCI-1731
-     
+
+Advantech PCI-173x/175x/176x DIO cards
+CONFIG_COMEDI_ADV_PCI_DIO
+  Includes support for these cards:
+     Advantech PCI-1730, PCI-1733, PCI-1734
+     Advantech PCI-1750
+     Advantech PCI-1751, PCI-1753, PCI-1753+PCI-1753E,
+     Advantech PCI-1752, PCI-1754, PCI-1756
+     Advantech PCI-1760
+     Advantech PCI-1762
+ For the PCI-1751/3/3E cards you also need select the generic 8255 driver.
+
 PCL 711 driver
 CONFIG_COMEDI_PCL711
   Includes support for PCL 711, 711b and ACL 8112.

diff --git a/comedi/Config.in b/comedi/Config.in
index 354cc7ef8178a962499710c74acab78485eaf198..337abb9d5047375020b1da8e5569ded23218dbed 100644 (file)
--- a/comedi/Config.in
+++ b/comedi/Config.in
@@ -96,6 +96,7 @@ dep_tristate 'Generic parallel port support' CONFIG_COMEDI_PARPORT $CONFIG_COMED
 dep_tristate 'ADLink PCI-9111DG/HR' CONFIG_COMEDI_ADL_PCI9111 $CONFIG_COMEDI
 dep_tristate 'ADLink PCI-9118DG/HR/HG' CONFIG_COMEDI_ADL_PCI9118 $CONFIG_COMEDI
 dep_tristate 'Advantech PCI-1710/HG/11/13/20/31' CONFIG_COMEDI_ADV_PCI1710 $CONFIG_COMEDI
+dep_tristate 'Advantech PCI-173x/175x/176x DIO cards' CONFIG_COMEDI_ADV_PCI_DIO $CONFIG_COMEDI
 dep_tristate 'PCL-711, PCL-711b, ACL-8112, and compatibles' CONFIG_COMEDI_PCL711 $CONFIG_COMEDI
 dep_tristate 'PCL-722/724/731, ACL-7122/7124, PET-48DIO' CONFIG_COMEDI_PCL724 $CONFIG_COMEDI
 dep_tristate 'PCL-725' CONFIG_COMEDI_PCL725 $CONFIG_COMEDI

diff --git a/comedi/comedi_fops.c b/comedi/comedi_fops.c
index bd80f7f3904c566a5fef002e15df6d3303a4d906..68265e79814076d8c1489e6b7046e3c3730d0485 100644 (file)
--- a/comedi/comedi_fops.c
+++ b/comedi/comedi_fops.c
@@ -384,6 +384,8 @@ static int do_subdinfo_ioctl(comedi_device *dev,comedi_subdinfo *arg,void *file)
                        us->subd_flags |= SDF_RANGETYPE;
                if(s->do_cmd)
                        us->subd_flags |= SDF_CMD;
+
+               us->settling_time_0 = s->settling_time_0;
        }
        
        ret=copy_to_user(arg,tmp,dev->n_subdevices*sizeof(comedi_subdinfo));

diff --git a/include/linux/comedidev.h b/include/linux/comedidev.h
index 3bff04306e80973f93553c5d49ec318461dca2bb..ec335c3edda5485c677d220b1a48cdac4425ecdf 100644 (file)
--- a/include/linux/comedidev.h
+++ b/include/linux/comedidev.h
@@ -115,6 +115,8 @@ struct comedi_subdevice_struct{
        unsigned int flags;
        unsigned int *flaglist;
 
+       unsigned int settling_time_0;
+
        comedi_lrange *range_table;
        comedi_lrange **range_table_list;