Fix cmdtest logic bug

diff --git a/comedi/drivers/cb_pcidas.c b/comedi/drivers/cb_pcidas.c
index eea4745eb78ef76e773da688cd4374eecea72a30..a73e780d19b48ff3cd3eee5d564c1a11d507391e 100644 (file)
--- a/comedi/drivers/cb_pcidas.c
+++ b/comedi/drivers/cb_pcidas.c
@@ -619,27 +619,27 @@ static int cb_pcidas_ai_cmdtest(comedi_device *dev,comedi_subdevice *s,
 
        tmp = cmd->start_src;
        cmd->start_src &= TRIG_NOW | TRIG_EXT;
-       if(!cmd->start_src && tmp != cmd->start_src)
+       if(!cmd->start_src || tmp != cmd->start_src)
                err++;
 
        tmp = cmd->scan_begin_src;
        cmd->scan_begin_src &= TRIG_FOLLOW | TRIG_TIMER | TRIG_EXT;
-       if(!cmd->scan_begin_src && tmp != cmd->scan_begin_src)
+       if(!cmd->scan_begin_src || tmp != cmd->scan_begin_src)
                err++;
 
        tmp = cmd->convert_src;
        cmd->convert_src &= TRIG_TIMER | TRIG_NOW | TRIG_EXT;
-       if(!cmd->convert_src && tmp != cmd->convert_src)
+       if(!cmd->convert_src || tmp != cmd->convert_src)
                err++;
 
        tmp = cmd->scan_end_src;
        cmd->scan_end_src &= TRIG_COUNT;
-       if(!cmd->scan_end_src && tmp != cmd->scan_end_src)
+       if(!cmd->scan_end_src || tmp != cmd->scan_end_src)
                err++;
 
        tmp = cmd->stop_src;
        cmd->stop_src &= TRIG_COUNT | TRIG_NONE;
-       if(!cmd->stop_src && tmp != cmd->stop_src)
+       if(!cmd->stop_src || tmp != cmd->stop_src)
                err++;
 
        if(err)return 1;

diff --git a/comedi/drivers/cb_pcidda.c b/comedi/drivers/cb_pcidda.c
index 67cbb0e0a1911115185180504c00235515c600cc..f2842319a7aea52451f86a80838ce7c0c212bdab 100644 (file)
--- a/comedi/drivers/cb_pcidda.c
+++ b/comedi/drivers/cb_pcidda.c
@@ -437,27 +437,27 @@ static int cb_pcidda_ai_cmdtest(comedi_device *dev,comedi_subdevice *s,
 
        tmp = cmd->start_src;
        cmd->start_src &= TRIG_NOW;
-       if(!cmd->start_src && tmp != cmd->start_src)
+       if(!cmd->start_src || tmp != cmd->start_src)
                err++;
 
        tmp = cmd->scan_begin_src;
        cmd->scan_begin_src &= TRIG_TIMER | TRIG_EXT;
-       if(!cmd->scan_begin_src && tmp != cmd->scan_begin_src)
+       if(!cmd->scan_begin_src || tmp != cmd->scan_begin_src)
                err++;
 
        tmp = cmd->convert_src;
        cmd->convert_src &= TRIG_TIMER | TRIG_EXT;
-       if(!cmd->convert_src && tmp != cmd->convert_src)
+       if(!cmd->convert_src || tmp != cmd->convert_src)
                err++;
 
        tmp = cmd->scan_end_src;
        cmd->scan_end_src &= TRIG_COUNT;
-       if(!cmd->scan_end_src && tmp != cmd->scan_end_src)
+       if(!cmd->scan_end_src || tmp != cmd->scan_end_src)
                err++;
 
        tmp = cmd->stop_src;
        cmd->stop_src &= TRIG_COUNT | TRIG_NONE;
-       if(!cmd->stop_src && tmp != cmd->stop_src)
+       if(!cmd->stop_src || tmp != cmd->stop_src)
                err++;
 
        if(err)return 1;

diff --git a/comedi/drivers/rtd520.c b/comedi/drivers/rtd520.c
index c37e92ada118e73730fa66ac8b48d27117a5796d..674287aac55affcee4807a1eef2a8d48f1cd5703 100644 (file)
--- a/comedi/drivers/rtd520.c
+++ b/comedi/drivers/rtd520.c
@@ -1066,8 +1066,7 @@ static void rtd_interrupt (
   the command passes.
 */
 
-static int
-rtd_ai_cmdtest (
+static int rtd_ai_cmdtest (
     comedi_device *dev,
     comedi_subdevice *s,
     comedi_cmd *cmd)
@@ -1079,41 +1078,31 @@ rtd_ai_cmdtest (
 
     tmp = cmd->start_src;
     cmd->start_src &= TRIG_NOW;
-    if (!cmd->start_src && tmp != cmd->start_src) {
-       printk ("rtd520: cmdtest error! start_src does not include NOW %x\n",
-               cmd->start_src);
+    if (!cmd->start_src || tmp != cmd->start_src) {
        err++;
     }
 
     tmp=cmd->scan_begin_src;
     cmd->scan_begin_src &= TRIG_TIMER|TRIG_EXT;
-    if (!cmd->scan_begin_src && tmp != cmd->scan_begin_src) {
-       printk ("rtd520: cmdtest error! scan_begin_src includes neither TIMER or EXT %x\n",
-               cmd->scan_begin_src);
+    if (!cmd->scan_begin_src || tmp != cmd->scan_begin_src) {
        err++;
     }
 
     tmp=cmd->convert_src;
     cmd->convert_src &= TRIG_TIMER|TRIG_EXT;
-    if (!cmd->convert_src && tmp != cmd->convert_src) {
-       printk ("rtd520: cmdtest error! convert_src includes neither TIMER or EXT %x\n",
-               cmd->convert_src);
+    if (!cmd->convert_src || tmp != cmd->convert_src) {
        err++;
     }
 
     tmp=cmd->scan_end_src;
     cmd->scan_end_src &= TRIG_COUNT;
-    if (!cmd->scan_end_src && tmp != cmd->scan_end_src) {
-       printk ("rtd520: cmdtest error! scan_end_src does not include COUNT %x\n",
-               cmd->scan_end_src);
+    if (!cmd->scan_end_src || tmp != cmd->scan_end_src) {
        err++;
     }
 
     tmp=cmd->stop_src;
     cmd->stop_src &= TRIG_COUNT|TRIG_NONE;
-    if (!cmd->stop_src && tmp != cmd->stop_src) {
-       printk ("rtd520: cmdtest error! stop_src includes neither COUNT or NONE %x\n",
-               cmd->stop_src);
+    if (!cmd->stop_src || tmp != cmd->stop_src) {
        err++;
     }
 
@@ -1122,7 +1111,6 @@ rtd_ai_cmdtest (
 
     /* step 2: make sure trigger sources are unique
        and mutually compatible */
-#if 0
     /* note that mutual compatiblity is not an issue here */
     if (cmd->scan_begin_src !=TRIG_TIMER &&
        cmd->scan_begin_src !=TRIG_EXT) {
@@ -1138,10 +1126,8 @@ rtd_ai_cmdtest (
     }
 
     if (err) {
-       printk ("rtd520: cmdtest error! Some trigger compatibility test failed.\n");
        return 2;
     }
-#endif
 
     /* step 3: make sure arguments are trivially compatible */