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

staging: comedi: pcl812: 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: 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 8712f901
...@@ -512,7 +512,6 @@ struct pcl812_private { ...@@ -512,7 +512,6 @@ struct pcl812_private {
unsigned int last_ai_chanspec; unsigned int last_ai_chanspec;
unsigned char mode_reg_int; /* there is stored INT number for some card */ unsigned char mode_reg_int; /* there is stored INT number for some card */
unsigned int ai_poll_ptr; /* how many sampes transfer poll */ unsigned int ai_poll_ptr; /* how many sampes transfer poll */
unsigned int ai_act_scan; /* how many scans we finished */
unsigned int dmapages; unsigned int dmapages;
unsigned int hwdmasize; unsigned int hwdmasize;
unsigned long dmabuf[2]; /* PTR to DMA buf */ unsigned long dmabuf[2]; /* PTR to DMA buf */
...@@ -807,7 +806,6 @@ static int pcl812_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) ...@@ -807,7 +806,6 @@ static int pcl812_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
devpriv->ai_dma = 0; devpriv->ai_dma = 0;
} }
devpriv->ai_act_scan = 0;
devpriv->ai_poll_ptr = 0; devpriv->ai_poll_ptr = 0;
/* don't we want wake up every scan? */ /* don't we want wake up every scan? */
...@@ -840,15 +838,10 @@ static int pcl812_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) ...@@ -840,15 +838,10 @@ static int pcl812_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
static bool pcl812_ai_next_chan(struct comedi_device *dev, static bool pcl812_ai_next_chan(struct comedi_device *dev,
struct comedi_subdevice *s) struct comedi_subdevice *s)
{ {
struct pcl812_private *devpriv = dev->private;
struct comedi_cmd *cmd = &s->async->cmd; struct comedi_cmd *cmd = &s->async->cmd;
if (s->async->cur_chan == 0)
devpriv->ai_act_scan++;
if (cmd->stop_src == TRIG_COUNT && if (cmd->stop_src == TRIG_COUNT &&
devpriv->ai_act_scan >= cmd->stop_arg) { s->async->scans_done >= cmd->stop_arg) {
/* all data sampled */
s->async->events |= COMEDI_CB_EOA; s->async->events |= COMEDI_CB_EOA;
return false; return false;
} }
......
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