Commit 7d4adbe4 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

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

Use the new helpers in the step 3 tests of das16cs_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 670c475c
...@@ -194,67 +194,41 @@ static int das16cs_ai_cmdtest(struct comedi_device *dev, ...@@ -194,67 +194,41 @@ static int das16cs_ai_cmdtest(struct comedi_device *dev,
if (err) if (err)
return 2; return 2;
/* step 3: make sure arguments are trivially compatible */ /* Step 3: check if arguments are trivially valid */
err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0);
if (cmd->start_arg != 0) {
cmd->start_arg = 0;
err++;
}
#define MAX_SPEED 10000 /* in nanoseconds */ #define MAX_SPEED 10000 /* in nanoseconds */
#define MIN_SPEED 1000000000 /* in nanoseconds */ #define MIN_SPEED 1000000000 /* in nanoseconds */
if (cmd->scan_begin_src == TRIG_TIMER) { if (cmd->scan_begin_src == TRIG_TIMER) {
if (cmd->scan_begin_arg < MAX_SPEED) { err |= cfc_check_trigger_arg_min(&cmd->scan_begin_arg,
cmd->scan_begin_arg = MAX_SPEED; MAX_SPEED);
err++; err |= cfc_check_trigger_arg_max(&cmd->scan_begin_arg,
} MIN_SPEED);
if (cmd->scan_begin_arg > MIN_SPEED) {
cmd->scan_begin_arg = MIN_SPEED;
err++;
}
} else { } else {
/* external trigger */ /* external trigger */
/* should be level/edge, hi/lo specification here */ /* should be level/edge, hi/lo specification here */
/* should specify multiple external triggers */ /* should specify multiple external triggers */
if (cmd->scan_begin_arg > 9) { err |= cfc_check_trigger_arg_max(&cmd->scan_begin_arg, 9);
cmd->scan_begin_arg = 9;
err++;
}
} }
if (cmd->convert_src == TRIG_TIMER) { if (cmd->convert_src == TRIG_TIMER) {
if (cmd->convert_arg < MAX_SPEED) { err |= cfc_check_trigger_arg_min(&cmd->convert_arg,
cmd->convert_arg = MAX_SPEED; MAX_SPEED);
err++; err |= cfc_check_trigger_arg_max(&cmd->convert_arg,
} MIN_SPEED);
if (cmd->convert_arg > MIN_SPEED) {
cmd->convert_arg = MIN_SPEED;
err++;
}
} else { } else {
/* external trigger */ /* external trigger */
/* see above */ /* see above */
if (cmd->convert_arg > 9) { err |= cfc_check_trigger_arg_max(&cmd->convert_arg, 9);
cmd->convert_arg = 9;
err++;
}
} }
if (cmd->scan_end_arg != cmd->chanlist_len) { err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len);
cmd->scan_end_arg = cmd->chanlist_len;
err++; if (cmd->stop_src == TRIG_COUNT)
} err |= cfc_check_trigger_arg_max(&cmd->stop_arg, 0x00ffffff);
if (cmd->stop_src == TRIG_COUNT) { else /* TRIG_NONE */
if (cmd->stop_arg > 0x00ffffff) { err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);
cmd->stop_arg = 0x00ffffff;
err++;
}
} else {
/* TRIG_NONE */
if (cmd->stop_arg != 0) {
cmd->stop_arg = 0;
err++;
}
}
if (err) if (err)
return 3; return 3;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment