staging: comedi: usbduxfast: remove #include "comedi_fc.h"
As preparation for removal of "comedi_fc.h", replace calls to the `cfc_check_trigger_...` functions from "comedi_fc.h" with the replacement `comedi_check_trigger_...` functions from "../comedidev.h" and remove the inclusion of "comedi_fc.h". Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Родитель
2b012d948c
Коммит
f53398ebde
|
@ -48,7 +48,6 @@
|
|||
#include <linux/input.h>
|
||||
#include <linux/fcntl.h>
|
||||
#include <linux/compiler.h>
|
||||
#include "comedi_fc.h"
|
||||
#include "../comedi_usb.h"
|
||||
|
||||
/*
|
||||
|
@ -343,23 +342,24 @@ static int usbduxfast_ai_cmdtest(struct comedi_device *dev,
|
|||
|
||||
/* Step 1 : check if triggers are trivially valid */
|
||||
|
||||
err |= cfc_check_trigger_src(&cmd->start_src,
|
||||
err |= comedi_check_trigger_src(&cmd->start_src,
|
||||
TRIG_NOW | TRIG_EXT | TRIG_INT);
|
||||
err |= cfc_check_trigger_src(&cmd->scan_begin_src,
|
||||
err |= comedi_check_trigger_src(&cmd->scan_begin_src,
|
||||
TRIG_FOLLOW | TRIG_EXT);
|
||||
err |= cfc_check_trigger_src(&cmd->convert_src, TRIG_TIMER | TRIG_EXT);
|
||||
err |= cfc_check_trigger_src(&cmd->scan_end_src, TRIG_COUNT);
|
||||
err |= cfc_check_trigger_src(&cmd->stop_src, TRIG_COUNT | TRIG_NONE);
|
||||
err |= comedi_check_trigger_src(&cmd->convert_src,
|
||||
TRIG_TIMER | TRIG_EXT);
|
||||
err |= comedi_check_trigger_src(&cmd->scan_end_src, TRIG_COUNT);
|
||||
err |= comedi_check_trigger_src(&cmd->stop_src, TRIG_COUNT | TRIG_NONE);
|
||||
|
||||
if (err)
|
||||
return 1;
|
||||
|
||||
/* Step 2a : make sure trigger sources are unique */
|
||||
|
||||
err |= cfc_check_trigger_is_unique(cmd->start_src);
|
||||
err |= cfc_check_trigger_is_unique(cmd->scan_begin_src);
|
||||
err |= cfc_check_trigger_is_unique(cmd->convert_src);
|
||||
err |= cfc_check_trigger_is_unique(cmd->stop_src);
|
||||
err |= comedi_check_trigger_is_unique(cmd->start_src);
|
||||
err |= comedi_check_trigger_is_unique(cmd->scan_begin_src);
|
||||
err |= comedi_check_trigger_is_unique(cmd->convert_src);
|
||||
err |= comedi_check_trigger_is_unique(cmd->stop_src);
|
||||
|
||||
/* Step 2b : and mutually compatible */
|
||||
|
||||
|
@ -372,12 +372,13 @@ static int usbduxfast_ai_cmdtest(struct comedi_device *dev,
|
|||
|
||||
/* Step 3: check if arguments are trivially valid */
|
||||
|
||||
err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0);
|
||||
err |= comedi_check_trigger_arg_is(&cmd->start_arg, 0);
|
||||
|
||||
if (!cmd->chanlist_len)
|
||||
err |= -EINVAL;
|
||||
|
||||
err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len);
|
||||
err |= comedi_check_trigger_arg_is(&cmd->scan_end_arg,
|
||||
cmd->chanlist_len);
|
||||
|
||||
if (cmd->chanlist_len == 1)
|
||||
min_sample_period = 1;
|
||||
|
@ -394,16 +395,16 @@ static int usbduxfast_ai_cmdtest(struct comedi_device *dev,
|
|||
|
||||
/* calc arg again */
|
||||
tmp = steps / 30;
|
||||
err |= cfc_check_trigger_arg_is(&cmd->convert_arg, tmp);
|
||||
err |= comedi_check_trigger_arg_is(&cmd->convert_arg, tmp);
|
||||
}
|
||||
|
||||
/* stop source */
|
||||
switch (cmd->stop_src) {
|
||||
case TRIG_COUNT:
|
||||
err |= cfc_check_trigger_arg_min(&cmd->stop_arg, 1);
|
||||
err |= comedi_check_trigger_arg_min(&cmd->stop_arg, 1);
|
||||
break;
|
||||
case TRIG_NONE:
|
||||
err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);
|
||||
err |= comedi_check_trigger_arg_is(&cmd->stop_arg, 0);
|
||||
break;
|
||||
/*
|
||||
* TRIG_EXT doesn't care since it doesn't trigger
|
||||
|
|
Загрузка…
Ссылка в новой задаче