From: Frank Mori Hess <fmhess@speakeasy.net>
Date: Mon, 2 Jul 2001 23:57:36 +0000 (+0000)
Subject: removed some unnecessary lines from command tests
X-Git-Tag: r0_7_60~107
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a32f30ba5d708cca6dadb1ef454c109362870fd6;p=comedi.git

removed some unnecessary lines from command tests
---

diff --git a/comedi/drivers/das1800.c b/comedi/drivers/das1800.c
index 99313bd2..0e0d11f2 100644
--- a/comedi/drivers/das1800.c
+++ b/comedi/drivers/das1800.c
@@ -1129,7 +1129,6 @@ static int das1800_ai_do_cmdtest(comedi_device *dev,comedi_subdevice *s,comedi_c
 		cmd->scan_begin_src != TRIG_EXT) err++;
 	if(cmd->convert_src != TRIG_TIMER &&
 		cmd->convert_src != TRIG_EXT) err++;
-	if(cmd->scan_end_src != TRIG_COUNT) err++;
 	if(cmd->stop_src != TRIG_COUNT &&
 		cmd->stop_src != TRIG_NONE &&
 		cmd->stop_src != TRIG_EXT) err++;
@@ -1159,11 +1158,6 @@ static int das1800_ai_do_cmdtest(comedi_device *dev,comedi_subdevice *s,comedi_c
 		cmd->chanlist_len = 1;
 		err++;
 	}
-	if(cmd->chanlist_len > s->len_chanlist)
-	{
-		cmd->chanlist_len = s->len_chanlist;
-		err++;
-	}
 	if(cmd->scan_end_arg != cmd->chanlist_len)
 	{
 		cmd->scan_end_arg = cmd->chanlist_len;
diff --git a/comedi/drivers/das800.c b/comedi/drivers/das800.c
index 80d009eb..838485f2 100644
--- a/comedi/drivers/das800.c
+++ b/comedi/drivers/das800.c
@@ -645,10 +645,8 @@ static int das800_ai_do_cmdtest(comedi_device *dev,comedi_subdevice *s,comedi_cm
 
 	if(cmd->start_src != TRIG_NOW &&
 		cmd->start_src != TRIG_EXT) err++;
-	if(cmd->scan_begin_src != TRIG_FOLLOW) err++;
 	if(cmd->convert_src != TRIG_TIMER &&
 	   cmd->convert_src != TRIG_EXT) err++;
-	if(cmd->scan_end_src != TRIG_COUNT) err++;
 	if(cmd->stop_src != TRIG_COUNT &&
 		cmd->stop_src != TRIG_NONE) err++;
 
@@ -674,11 +672,6 @@ static int das800_ai_do_cmdtest(comedi_device *dev,comedi_subdevice *s,comedi_cm
 		cmd->chanlist_len = 1;
 		err++;
 	}
-	if(cmd->chanlist_len > s->len_chanlist)
-	{
-		cmd->chanlist_len = s->len_chanlist;
-		err++;
-	}
 	if(cmd->scan_end_arg != cmd->chanlist_len)
 	{
 		cmd->scan_end_arg = cmd->chanlist_len;