Skip to content

L
linux
Commit c3be5c7f authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files
Options

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

Use the new helpers in the step 3 tests of ni_{ai,ao,cdio}_cmdtest().

Note that all the command triggers in ni_cdio_cmdtest are single source
so the extra tests are not required.
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 7ec26590
Show whitespace changes
Inline Side-by-side
Showing with 51 additions and 135 deletions
drivers/staging/comedi/drivers/ni_mio_common.c
View file @ c3be5c7f
...@@ -2256,7 +2256,7 @@ static int ni_ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, ...@@ -2256,7 +2256,7 @@ static int ni_ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
if (err) if (err)
return 2; return 2;
/* step 3: make sure arguments are trivially compatible */ /* Step 3: check if arguments are trivially valid */
if (cmd->start_src == TRIG_EXT) { if (cmd->start_src == TRIG_EXT) {
/* external trigger */ /* external trigger */
...@@ -2265,30 +2265,17 @@ static int ni_ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, ...@@ -2265,30 +2265,17 @@ static int ni_ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
if (tmp > 16) if (tmp > 16)
tmp = 16; tmp = 16;
tmp |= (cmd->start_arg & (CR_INVERT | CR_EDGE)); tmp |= (cmd->start_arg & (CR_INVERT | CR_EDGE));
if (cmd->start_arg != tmp) { err |= cfc_check_trigger_arg_is(&cmd->start_arg, tmp);
cmd->start_arg = tmp;
err++;
}
} else { } else {
if (cmd->start_arg != 0) {
/* true for both TRIG_NOW and TRIG_INT */ /* true for both TRIG_NOW and TRIG_INT */
cmd->start_arg = 0; err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0);
err++;
}
} }
if (cmd->scan_begin_src == TRIG_TIMER) { if (cmd->scan_begin_src == TRIG_TIMER) {
if (cmd->scan_begin_arg < ni_min_ai_scan_period_ns(dev, err |= cfc_check_trigger_arg_min(&cmd->scan_begin_arg,
cmd-> ni_min_ai_scan_period_ns(dev, cmd->chanlist_len));
chanlist_len)) err |= cfc_check_trigger_arg_max(&cmd->scan_begin_arg,
{ devpriv->clock_ns * 0xffffff);
cmd->scan_begin_arg =
ni_min_ai_scan_period_ns(dev, cmd->chanlist_len);
err++;
}
if (cmd->scan_begin_arg > devpriv->clock_ns * 0xffffff) {
cmd->scan_begin_arg = devpriv->clock_ns * 0xffffff;
err++;
}
} else if (cmd->scan_begin_src == TRIG_EXT) { } else if (cmd->scan_begin_src == TRIG_EXT) {
/* external trigger */ /* external trigger */
unsigned int tmp = CR_CHAN(cmd->scan_begin_arg); unsigned int tmp = CR_CHAN(cmd->scan_begin_arg);
...@@ -2296,32 +2283,20 @@ static int ni_ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, ...@@ -2296,32 +2283,20 @@ static int ni_ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
if (tmp > 16) if (tmp > 16)
tmp = 16; tmp = 16;
tmp |= (cmd->scan_begin_arg & (CR_INVERT | CR_EDGE)); tmp |= (cmd->scan_begin_arg & (CR_INVERT | CR_EDGE));
if (cmd->scan_begin_arg != tmp) { err |= cfc_check_trigger_arg_is(&cmd->scan_begin_arg, tmp);
cmd->scan_begin_arg = tmp;
err++;
}
} else { /* TRIG_OTHER */ } else { /* TRIG_OTHER */
if (cmd->scan_begin_arg) { err |= cfc_check_trigger_arg_is(&cmd->scan_begin_arg, 0);
cmd->scan_begin_arg = 0;
err++;
}
} }
if (cmd->convert_src == TRIG_TIMER) { if (cmd->convert_src == TRIG_TIMER) {
if ((boardtype.reg_type == ni_reg_611x) if ((boardtype.reg_type == ni_reg_611x)
|| (boardtype.reg_type == ni_reg_6143)) { || (boardtype.reg_type == ni_reg_6143)) {
if (cmd->convert_arg != 0) { err |= cfc_check_trigger_arg_is(&cmd->convert_arg, 0);
cmd->convert_arg = 0;
err++;
}
} else { } else {
if (cmd->convert_arg < boardtype.ai_speed) { err |= cfc_check_trigger_arg_min(&cmd->convert_arg,
cmd->convert_arg = boardtype.ai_speed; boardtype.ai_speed);
err++; err |= cfc_check_trigger_arg_max(&cmd->convert_arg,
} devpriv->clock_ns * 0xffff);
if (cmd->convert_arg > devpriv->clock_ns * 0xffff) {
cmd->convert_arg = devpriv->clock_ns * 0xffff;
err++;
}
} }
} else if (cmd->convert_src == TRIG_EXT) { } else if (cmd->convert_src == TRIG_EXT) {
/* external trigger */ /* external trigger */
...@@ -2330,40 +2305,23 @@ static int ni_ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, ...@@ -2330,40 +2305,23 @@ static int ni_ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
if (tmp > 16) if (tmp > 16)
tmp = 16; tmp = 16;
tmp |= (cmd->convert_arg & (CR_ALT_FILTER | CR_INVERT)); tmp |= (cmd->convert_arg & (CR_ALT_FILTER | CR_INVERT));
if (cmd->convert_arg != tmp) { err |= cfc_check_trigger_arg_is(&cmd->convert_arg, tmp);
cmd->convert_arg = tmp;
err++;
}
} else if (cmd->convert_src == TRIG_NOW) { } else if (cmd->convert_src == TRIG_NOW) {
if (cmd->convert_arg != 0) { err |= cfc_check_trigger_arg_is(&cmd->convert_arg, 0);
cmd->convert_arg = 0;
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) { if (cmd->stop_src == TRIG_COUNT) {
unsigned int max_count = 0x01000000; unsigned int max_count = 0x01000000;
if (boardtype.reg_type == ni_reg_611x) if (boardtype.reg_type == ni_reg_611x)
max_count -= num_adc_stages_611x; max_count -= num_adc_stages_611x;
if (cmd->stop_arg > max_count) { err |= cfc_check_trigger_arg_max(&cmd->stop_arg, max_count);
cmd->stop_arg = max_count; err |= cfc_check_trigger_arg_min(&cmd->stop_arg, 1);
err++;
}
if (cmd->stop_arg < 1) {
cmd->stop_arg = 1;
err++;
}
} else { } else {
/* TRIG_NONE */ /* TRIG_NONE */
if (cmd->stop_arg != 0) { err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);
cmd->stop_arg = 0;
err++;
}
} }
if (err) if (err)
...@@ -3432,7 +3390,7 @@ static int ni_ao_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, ...@@ -3432,7 +3390,7 @@ static int ni_ao_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
if (err) if (err)
return 2; return 2;
/* step 3: make sure arguments are trivially compatible */ /* Step 3: check if arguments are trivially valid */
if (cmd->start_src == TRIG_EXT) { if (cmd->start_src == TRIG_EXT) {
/* external trigger */ /* external trigger */
...@@ -3441,48 +3399,27 @@ static int ni_ao_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, ...@@ -3441,48 +3399,27 @@ static int ni_ao_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
if (tmp > 18) if (tmp > 18)
tmp = 18; tmp = 18;
tmp |= (cmd->start_arg & (CR_INVERT | CR_EDGE)); tmp |= (cmd->start_arg & (CR_INVERT | CR_EDGE));
if (cmd->start_arg != tmp) { err |= cfc_check_trigger_arg_is(&cmd->start_arg, tmp);
cmd->start_arg = tmp;
err++;
}
} else { } else {
if (cmd->start_arg != 0) {
/* true for both TRIG_NOW and TRIG_INT */ /* true for both TRIG_NOW and TRIG_INT */
cmd->start_arg = 0; err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0);
err++;
}
} }
if (cmd->scan_begin_src == TRIG_TIMER) { if (cmd->scan_begin_src == TRIG_TIMER) {
if (cmd->scan_begin_arg < boardtype.ao_speed) { err |= cfc_check_trigger_arg_min(&cmd->scan_begin_arg,
cmd->scan_begin_arg = boardtype.ao_speed; boardtype.ao_speed);
err++; err |= cfc_check_trigger_arg_max(&cmd->scan_begin_arg,
} devpriv->clock_ns * 0xffffff);
if (cmd->scan_begin_arg > devpriv->clock_ns * 0xffffff) { /* XXX check */
cmd->scan_begin_arg = devpriv->clock_ns * 0xffffff;
err++;
}
}
if (cmd->convert_arg != 0) {
cmd->convert_arg = 0;
err++;
}
if (cmd->scan_end_arg != cmd->chanlist_len) {
cmd->scan_end_arg = cmd->chanlist_len;
err++;
}
if (cmd->stop_src == TRIG_COUNT) { /* XXX check */
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->convert_arg, 0);
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) if (err)
return 3; return 3;
...@@ -3706,39 +3643,18 @@ static int ni_cdio_cmdtest(struct comedi_device *dev, ...@@ -3706,39 +3643,18 @@ static int ni_cdio_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 */
if (cmd->start_src == TRIG_INT) {
if (cmd->start_arg != 0) {
cmd->start_arg = 0;
err++;
}
}
if (cmd->scan_begin_src == TRIG_EXT) {
tmp = cmd->scan_begin_arg;
tmp &= CR_PACK_FLAGS(CDO_Sample_Source_Select_Mask, 0, 0,
CR_INVERT);
if (tmp != cmd->scan_begin_arg) {
err++;
}
}
if (cmd->convert_src == TRIG_NOW) {
if (cmd->convert_arg) {
cmd->convert_arg = 0;
err++;
}
}
if (cmd->scan_end_arg != cmd->chanlist_len) { err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0);
cmd->scan_end_arg = cmd->chanlist_len;
err++;
}
if (cmd->stop_src == TRIG_NONE) { tmp = cmd->scan_begin_arg;
if (cmd->stop_arg != 0) { tmp &= CR_PACK_FLAGS(CDO_Sample_Source_Select_Mask, 0, 0, CR_INVERT);
cmd->stop_arg = 0; if (tmp != cmd->scan_begin_arg)
err++; err |= -EINVAL;
}
} err |= cfc_check_trigger_arg_is(&cmd->convert_arg, 0);
err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len);
err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7