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

staging: comedi: das1800: 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 dedb59fc

drivers/staging/comedi/drivers/das1800.c

+27 −24
Original line number Diff line number Diff line
@@ -102,7 +102,6 @@ TODO: 
#include "../comedidev.h"



#include "comedi_isadma.h"

#include "comedi_fc.h"

#include "comedi_8254.h"



/* misc. defines */
@@ -732,12 +731,13 @@ static int das1800_ai_do_cmdtest(struct comedi_device *dev, 


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



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

	err |= cfc_check_trigger_src(&cmd->scan_begin_src,

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

	err |= comedi_check_trigger_src(&cmd->scan_begin_src,

					TRIG_FOLLOW | TRIG_TIMER | 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,

	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_EXT | TRIG_NONE);



	if (err)
@@ -745,10 +745,10 @@ static int das1800_ai_do_cmdtest(struct comedi_device *dev, 


	/* 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 */
@@ -761,21 +761,23 @@ static int das1800_ai_do_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->convert_src == TRIG_TIMER)

		err |= cfc_check_trigger_arg_min(&cmd->convert_arg,

	if (cmd->convert_src == TRIG_TIMER) {

		err |= comedi_check_trigger_arg_min(&cmd->convert_arg,

						    thisboard->ai_speed);

	}



	err |= cfc_check_trigger_arg_min(&cmd->chanlist_len, 1);

	err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len);

	err |= comedi_check_trigger_arg_min(&cmd->chanlist_len, 1);

	err |= comedi_check_trigger_arg_is(&cmd->scan_end_arg,

					   cmd->chanlist_len);



	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;

	default:

		break;
@@ -791,21 +793,22 @@ static int das1800_ai_do_cmdtest(struct comedi_device *dev, 
		/* we are not in burst mode */

		arg = cmd->convert_arg;

		comedi_8254_cascade_ns_to_timer(dev->pacer, &arg, cmd->flags);

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

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

	} else if (cmd->convert_src == TRIG_TIMER) {

		/* we are in burst mode */

		arg = burst_convert_arg(cmd->convert_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->chanlist_len;

			err |= cfc_check_trigger_arg_max(&cmd->scan_begin_arg,

			err |= comedi_check_trigger_arg_max(&cmd->

							    scan_begin_arg,

							    arg);



			arg = cmd->scan_begin_arg;

			comedi_8254_cascade_ns_to_timer(dev->pacer, &arg,

							cmd->flags);

			err |= cfc_check_trigger_arg_is(&cmd->scan_begin_arg,

			err |= comedi_check_trigger_arg_is(&cmd->scan_begin_arg,

							   arg);

		}

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE