For AI command, allow scan_begin_src == EXT_TRIG for PCI260+ (but not PCI260).
authorIan Abbott <abbotti@mev.co.uk>
Fri, 23 Nov 2007 17:09:08 +0000 (17:09 +0000)
committerIan Abbott <abbotti@mev.co.uk>
Fri, 23 Nov 2007 17:09:08 +0000 (17:09 +0000)
It will use the EXTTRIG/EXTCONVCLK input on pin 17 instead of the PPIC0 input
that is used for PCI230.

comedi/drivers/amplc_pci230.c

index 117857d6d08a38caeed54da2de775daae3c6a77e..884aabd043f3949c505aac922ea768f56aff55a2 100644 (file)
@@ -1281,9 +1281,10 @@ static int pci230_ai_cmdtest(comedi_device * dev, comedi_subdevice * s,
 
        tmp = cmd->scan_begin_src;
        /* Unfortunately, we cannot trigger a scan off an external source
-        * on the PCI260 board, since it uses the PPI0 (DIO) input, which
-        * isn't present on the PCI260 */
-       if (thisboard->have_dio) {
+        * on the PCI260 board, since it uses the PPIC0 (DIO) input, which
+        * isn't present on the PCI260.  For PCI260+ we can use the
+        * EXTTRIG/EXTCONVCLK input on pin 17 instead. */
+       if ((thisboard->have_dio) || (thisboard->min_hwver > 0)) {
                cmd->scan_begin_src &= TRIG_FOLLOW | TRIG_TIMER | TRIG_INT
                        | TRIG_EXT;
        } else {