From 2e3debb8fee20769b1779830702a8d05056953f4 Mon Sep 17 00:00:00 2001 From: Frank Mori Hess Date: Thu, 9 Aug 2007 13:03:37 +0000 Subject: [PATCH] NI counters don't really support stop_src TRIG_COUNT. --- comedi/drivers/ni_tio.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/comedi/drivers/ni_tio.c b/comedi/drivers/ni_tio.c index 83f0253a..8ab81671 100644 --- a/comedi/drivers/ni_tio.c +++ b/comedi/drivers/ni_tio.c @@ -2492,8 +2492,8 @@ int ni_tio_cmdtest(struct ni_gpct *counter, comedi_cmd *cmd) 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) err++; + cmd->stop_src &= TRIG_NONE; + if(!cmd->stop_src || tmp != cmd->stop_src) err++; if(err) return 1; @@ -2509,8 +2509,7 @@ int ni_tio_cmdtest(struct ni_gpct *counter, comedi_cmd *cmd) if(cmd->convert_src != TRIG_OTHER && cmd->convert_src != TRIG_EXT && cmd->convert_src != TRIG_NOW) err++; - if(cmd->stop_src != TRIG_COUNT && - cmd->stop_src != TRIG_NONE) err++; + if(cmd->stop_src != TRIG_NONE) err++; /* ... and mutually compatible */ if(cmd->convert_src != TRIG_NOW && cmd->scan_begin_src != TRIG_FOLLOW) err++; -- 2.26.2