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

staging: comedi: drivers: introduce comedi_nsamples_left()

Introduce a helper function to calculate the number of samples remaining
when the cmd->stop_src is TRIG_COUNT.
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a65ccf63
...@@ -518,6 +518,8 @@ unsigned int comedi_dio_update_state(struct comedi_subdevice *, ...@@ -518,6 +518,8 @@ unsigned int comedi_dio_update_state(struct comedi_subdevice *,
unsigned int comedi_bytes_per_scan(struct comedi_subdevice *s); unsigned int comedi_bytes_per_scan(struct comedi_subdevice *s);
unsigned int comedi_nscans_left(struct comedi_subdevice *s, unsigned int comedi_nscans_left(struct comedi_subdevice *s,
unsigned int nscans); unsigned int nscans);
unsigned int comedi_nsamples_left(struct comedi_subdevice *s,
unsigned int nsamples);
void comedi_inc_scan_progress(struct comedi_subdevice *s, void comedi_inc_scan_progress(struct comedi_subdevice *s,
unsigned int num_bytes); unsigned int num_bytes);
......
...@@ -366,6 +366,38 @@ unsigned int comedi_nscans_left(struct comedi_subdevice *s, ...@@ -366,6 +366,38 @@ unsigned int comedi_nscans_left(struct comedi_subdevice *s,
} }
EXPORT_SYMBOL_GPL(comedi_nscans_left); EXPORT_SYMBOL_GPL(comedi_nscans_left);
/**
* comedi_nsamples_left - return the number of samples left in the command
* @s: comedi_subdevice struct
* @nsamples: the expected number of samples
*
* Returns the expected number of samples of the number of samples remaining
* in the command.
*/
unsigned int comedi_nsamples_left(struct comedi_subdevice *s,
unsigned int nsamples)
{
struct comedi_async *async = s->async;
struct comedi_cmd *cmd = &async->cmd;
if (cmd->stop_src == TRIG_COUNT) {
/* +1 to force comedi_nscans_left() to return the scans left */
unsigned int nscans = (nsamples / cmd->scan_end_arg) + 1;
unsigned int scans_left = comedi_nscans_left(s, nscans);
unsigned long long samples_left = 0;
if (scans_left) {
samples_left = ((unsigned long long)scans_left *
cmd->scan_end_arg) - async->cur_chan;
}
if (samples_left < nsamples)
nsamples = samples_left;
}
return nsamples;
}
EXPORT_SYMBOL_GPL(comedi_nsamples_left);
/** /**
* comedi_inc_scan_progress - update scan progress in asynchronous command * comedi_inc_scan_progress - update scan progress in asynchronous command
* @s: comedi_subdevice struct * @s: comedi_subdevice struct
......
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