Commit e9a3c431 authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman
Browse files

staging: comedi: dt3000: 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: default avatarIan Abbott <abbotti@mev.co.uk>
Reviewed-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 34e444c8

drivers/staging/comedi/drivers/dt3000.c

+23 −23
Original line number Diff line number Diff line
@@ -54,8 +54,6 @@ AO commands are not supported. 


#include "../comedi_pci.h"



#include "comedi_fc.h"



static const struct comedi_lrange range_dt3000_ai = {

	4, {

		BIP_RANGE(10),
@@ -408,11 +406,11 @@ static int dt3k_ai_cmdtest(struct comedi_device *dev, 


	/* Step 1 : check if triggers are trivially valid */



	err |= cfc_check_trigger_src(&cmd->start_src, TRIG_NOW);

	err |= cfc_check_trigger_src(&cmd->scan_begin_src, TRIG_TIMER);

	err |= cfc_check_trigger_src(&cmd->convert_src, TRIG_TIMER);

	err |= cfc_check_trigger_src(&cmd->scan_end_src, TRIG_COUNT);

	err |= cfc_check_trigger_src(&cmd->stop_src, TRIG_COUNT);

	err |= comedi_check_trigger_src(&cmd->start_src, TRIG_NOW);

	err |= comedi_check_trigger_src(&cmd->scan_begin_src, TRIG_TIMER);

	err |= comedi_check_trigger_src(&cmd->convert_src, TRIG_TIMER);

	err |= comedi_check_trigger_src(&cmd->scan_end_src, TRIG_COUNT);

	err |= comedi_check_trigger_src(&cmd->stop_src, TRIG_COUNT);



	if (err)

		return 1;
@@ -422,28 +420,29 @@ static int dt3k_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->scan_begin_src == TRIG_TIMER) {

		err |= cfc_check_trigger_arg_min(&cmd->scan_begin_arg,

		err |= comedi_check_trigger_arg_min(&cmd->scan_begin_arg,

						    this_board->ai_speed);

		err |= cfc_check_trigger_arg_max(&cmd->scan_begin_arg,

		err |= comedi_check_trigger_arg_max(&cmd->scan_begin_arg,

						    100 * 16 * 65535);

	}



	if (cmd->convert_src == TRIG_TIMER) {

		err |= cfc_check_trigger_arg_min(&cmd->convert_arg,

		err |= comedi_check_trigger_arg_min(&cmd->convert_arg,

						    this_board->ai_speed);

		err |= cfc_check_trigger_arg_max(&cmd->convert_arg,

		err |= comedi_check_trigger_arg_max(&cmd->convert_arg,

						    50 * 16 * 65535);

	}



	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->stop_src == TRIG_COUNT)

		err |= cfc_check_trigger_arg_max(&cmd->stop_arg, 0x00ffffff);

		err |= comedi_check_trigger_arg_max(&cmd->stop_arg, 0x00ffffff);

	else	/* TRIG_NONE */

		err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);

		err |= comedi_check_trigger_arg_is(&cmd->stop_arg, 0);



	if (err)

		return 3;
@@ -453,17 +452,18 @@ static int dt3k_ai_cmdtest(struct comedi_device *dev, 
	if (cmd->scan_begin_src == TRIG_TIMER) {

		arg = cmd->scan_begin_arg;

		dt3k_ns_to_timer(100, &arg, cmd->flags);

		err |= cfc_check_trigger_arg_is(&cmd->scan_begin_arg, arg);

		err |= comedi_check_trigger_arg_is(&cmd->scan_begin_arg, arg);

	}



	if (cmd->convert_src == TRIG_TIMER) {

		arg = cmd->convert_arg;

		dt3k_ns_to_timer(50, &arg, cmd->flags);

		err |= cfc_check_trigger_arg_is(&cmd->convert_arg, arg);

		err |= comedi_check_trigger_arg_is(&cmd->convert_arg, arg);



		if (cmd->scan_begin_src == TRIG_TIMER) {

			arg = cmd->convert_arg * cmd->scan_end_arg;

			err |= cfc_check_trigger_arg_min(&cmd->scan_begin_arg,

			err |= comedi_check_trigger_arg_min(&cmd->

							    scan_begin_arg,

							    arg);

		}

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE