staging: comedi: pcl816: use comedi_async 'scans_done' to detect EOA
Remove the private data member 'ai_act_scan' and use the comedi_async 'scans_done' member to detect the end-of-acquisition. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Reviewed-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Родитель
5f6da288e3
Коммит
64886498b2
|
@ -122,7 +122,6 @@ struct pcl816_private {
|
|||
int next_dma_buf; /* which DMA buffer will be used next round */
|
||||
long dma_runs_to_end; /* how many we must permorm DMA transfer to end of record */
|
||||
unsigned long last_dma_run; /* how many bytes we must transfer on last DMA page */
|
||||
int ai_act_scan; /* how many scans we finished */
|
||||
unsigned int ai_poll_ptr; /* how many sampes transfer poll */
|
||||
unsigned int divisor1;
|
||||
unsigned int divisor2;
|
||||
|
@ -286,15 +285,10 @@ static int pcl816_ai_eoc(struct comedi_device *dev,
|
|||
static bool pcl816_ai_next_chan(struct comedi_device *dev,
|
||||
struct comedi_subdevice *s)
|
||||
{
|
||||
struct pcl816_private *devpriv = dev->private;
|
||||
struct comedi_cmd *cmd = &s->async->cmd;
|
||||
|
||||
if (s->async->cur_chan == 0)
|
||||
devpriv->ai_act_scan++;
|
||||
|
||||
if (cmd->stop_src == TRIG_COUNT &&
|
||||
devpriv->ai_act_scan >= cmd->stop_arg) {
|
||||
/* all data sampled */
|
||||
s->async->scans_done >= cmd->stop_arg) {
|
||||
s->async->events |= COMEDI_CB_EOA;
|
||||
return false;
|
||||
}
|
||||
|
@ -504,7 +498,6 @@ static int pcl816_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
|
|||
pcl816_ai_setup_chanlist(dev, cmd->chanlist, seglen);
|
||||
udelay(1);
|
||||
|
||||
devpriv->ai_act_scan = 0;
|
||||
devpriv->ai_cmd_running = 1;
|
||||
devpriv->ai_poll_ptr = 0;
|
||||
devpriv->ai_cmd_canceled = 0;
|
||||
|
|
Загрузка…
Ссылка в новой задаче