summaryrefslogtreecommitdiff
path: root/drivers/staging/comedi/drivers/pcl818.c
diff options
context:
space:
mode:
authorH Hartley Sweeten <hsweeten@visionengravers.com>2014-03-04 11:30:06 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-03-06 17:06:16 -0800
commit9fdef9c84a8ca68ac48de4b778ec229744924041 (patch)
treec29c8851abcf3d7c87d708b0b001daf1b25069a4 /drivers/staging/comedi/drivers/pcl818.c
parent9fd3effaa7334f6061f4ad4b57665f375457d0eb (diff)
staging: comedi: pcl818: introduce pcl818_ai_soft_trig()
Introduce a helper function to start a software triggered analog input conversion. 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>
Diffstat (limited to 'drivers/staging/comedi/drivers/pcl818.c')
-rw-r--r--drivers/staging/comedi/drivers/pcl818.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/staging/comedi/drivers/pcl818.c b/drivers/staging/comedi/drivers/pcl818.c
index d90c47db5da3..1783b6f6767e 100644
--- a/drivers/staging/comedi/drivers/pcl818.c
+++ b/drivers/staging/comedi/drivers/pcl818.c
@@ -406,6 +406,11 @@ static void pcl818_ai_clear_eoc(struct comedi_device *dev)
outb(0, dev->iobase + PCL818_CLRINT);
}
+static void pcl818_ai_soft_trig(struct comedi_device *dev)
+{
+ /* writing any value triggers a software conversion */
+ outb(0, dev->iobase + PCL818_AD_LO);
+}
static unsigned int pcl818_ai_get_fifo_sample(struct comedi_device *dev,
struct comedi_subdevice *s,
@@ -915,7 +920,7 @@ static int pcl818_ai_cancel(struct comedi_device *dev,
dev->iobase + PCL818_CONTROL); /* Stop A/D */
udelay(1);
pcl818_start_pacer(dev, false);
- outb(0, dev->iobase + PCL818_AD_LO);
+ pcl818_ai_soft_trig(dev);
pcl818_ai_get_sample(dev, s, NULL);
outb(0, dev->iobase + PCL818_CONTROL); /* Stop A/D */
pcl818_ai_clear_eoc(dev);
@@ -951,8 +956,7 @@ static int pcl818_ai_insn_read(struct comedi_device *dev,
for (i = 0; i < insn->n; i++) {
pcl818_ai_clear_eoc(dev);
- /* start conversion */
- outb(0, dev->iobase + PCL818_AD_LO);
+ pcl818_ai_soft_trig(dev);
ret = comedi_timeout(dev, s, insn, pcl818_ai_eoc, 0);
if (ret)