Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 53a254b9 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

staging: comedi: s626: use cfc_check_trigger_arg_*() helpers 



Use the new helpers in the step 3 tests of s626_ai_cmdtest().

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8a2b08ec

drivers/staging/comedi/drivers/s626.c

+22 −56
Original line number Diff line number Diff line
@@ -1549,80 +1549,46 @@ static int s626_ai_cmdtest(struct comedi_device *dev, 


	/* step 3: make sure arguments are trivially compatible */



	if (cmd->start_src != TRIG_EXT && cmd->start_arg != 0) {

		cmd->start_arg = 0;

		err++;

	}

	if (cmd->start_src != TRIG_EXT)

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

	if (cmd->start_src == TRIG_EXT)

		err |= cfc_check_trigger_arg_max(&cmd->start_arg, 39);



	if (cmd->start_src == TRIG_EXT && cmd->start_arg > 39) {

		cmd->start_arg = 39;

		err++;

	}

	if (cmd->scan_begin_src == TRIG_EXT)

		err |= cfc_check_trigger_arg_max(&cmd->scan_begin_arg, 39);



	if (cmd->scan_begin_src == TRIG_EXT && cmd->scan_begin_arg > 39) {

		cmd->scan_begin_arg = 39;

		err++;

	}

	if (cmd->convert_src == TRIG_EXT)

		err |= cfc_check_trigger_arg_max(&cmd->convert_arg, 39);



	if (cmd->convert_src == TRIG_EXT && cmd->convert_arg > 39) {

		cmd->convert_arg = 39;

		err++;

	}

#define MAX_SPEED	200000	/* in nanoseconds */

#define MIN_SPEED	2000000000	/* in nanoseconds */



	if (cmd->scan_begin_src == TRIG_TIMER) {

		if (cmd->scan_begin_arg < MAX_SPEED) {

			cmd->scan_begin_arg = MAX_SPEED;

			err++;

		}

		if (cmd->scan_begin_arg > MIN_SPEED) {

			cmd->scan_begin_arg = MIN_SPEED;

			err++;

		}

		err |= cfc_check_trigger_arg_min(&cmd->scan_begin_arg,

						 MAX_SPEED);

		err |= cfc_check_trigger_arg_max(&cmd->scan_begin_arg,

						 MIN_SPEED);

	} else {

		/* external trigger */

		/* should be level/edge, hi/lo specification here */

		/* should specify multiple external triggers */

/*     if(cmd->scan_begin_arg>9){ */

/*       cmd->scan_begin_arg=9; */

/*       err++; */

/*     } */

/*		err |= cfc_check_trigger_arg_max(&cmd->scan_begin_arg, 9); */

	}

	if (cmd->convert_src == TRIG_TIMER) {

		if (cmd->convert_arg < MAX_SPEED) {

			cmd->convert_arg = MAX_SPEED;

			err++;

		}

		if (cmd->convert_arg > MIN_SPEED) {

			cmd->convert_arg = MIN_SPEED;

			err++;

		}

		err |= cfc_check_trigger_arg_min(&cmd->convert_arg, MAX_SPEED);

		err |= cfc_check_trigger_arg_max(&cmd->convert_arg, MIN_SPEED);

	} else {

		/* external trigger */

		/* see above */

/*     if(cmd->convert_arg>9){ */

/*       cmd->convert_arg=9; */

/*       err++; */

/*     } */

/*		err |= cfc_check_trigger_arg_max(&cmd->scan_begin_arg, 9); */

	}



	if (cmd->scan_end_arg != cmd->chanlist_len) {

		cmd->scan_end_arg = cmd->chanlist_len;

		err++;

	}

	if (cmd->stop_src == TRIG_COUNT) {

		if (cmd->stop_arg > 0x00ffffff) {

			cmd->stop_arg = 0x00ffffff;

			err++;

		}

	} else {

		/* TRIG_NONE */

		if (cmd->stop_arg != 0) {

			cmd->stop_arg = 0;

			err++;

		}

	}

	err |= cfc_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);

	else	/* TRIG_NONE */

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



	if (err)

		return 3;