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

staging: comedi: pcmmio: use comedi_async 'scans_done' to detect EOA

Remove the private data member 'count' 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 f831de10
...@@ -190,7 +190,6 @@ struct pcmmio_private { ...@@ -190,7 +190,6 @@ struct pcmmio_private {
spinlock_t pagelock; /* protects the page registers */ spinlock_t pagelock; /* protects the page registers */
spinlock_t spinlock; /* protects the member variables */ spinlock_t spinlock; /* protects the member variables */
unsigned int enabled_mask; unsigned int enabled_mask;
unsigned int stop_count;
unsigned int active:1; unsigned int active:1;
}; };
...@@ -358,12 +357,9 @@ static void pcmmio_handle_dio_intr(struct comedi_device *dev, ...@@ -358,12 +357,9 @@ static void pcmmio_handle_dio_intr(struct comedi_device *dev,
comedi_buf_write_samples(s, &val, 1); comedi_buf_write_samples(s, &val, 1);
/* Check for end of acquisition. */ if (cmd->stop_src == TRIG_COUNT &&
if (cmd->stop_src == TRIG_COUNT && devpriv->stop_count > 0) { s->async->scans_done >= cmd->stop_arg)
devpriv->stop_count--; s->async->events |= COMEDI_CB_EOA;
if (devpriv->stop_count == 0)
s->async->events |= COMEDI_CB_EOA;
}
done: done:
spin_unlock_irqrestore(&devpriv->spinlock, flags); spin_unlock_irqrestore(&devpriv->spinlock, flags);
...@@ -468,8 +464,6 @@ static int pcmmio_cmd(struct comedi_device *dev, struct comedi_subdevice *s) ...@@ -468,8 +464,6 @@ static int pcmmio_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
spin_lock_irqsave(&devpriv->spinlock, flags); spin_lock_irqsave(&devpriv->spinlock, flags);
devpriv->active = 1; devpriv->active = 1;
devpriv->stop_count = cmd->stop_arg;
/* Set up start of acquisition. */ /* Set up start of acquisition. */
if (cmd->start_src == TRIG_INT) if (cmd->start_src == TRIG_INT)
s->async->inttrig = pcmmio_inttrig_start_intr; s->async->inttrig = pcmmio_inttrig_start_intr;
......
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