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

staging: comedi: dt2811: use comedi_timeout()

Use comedi_timeout() to wait for the analog input end-of-conversion.
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ab984177
...@@ -224,23 +224,32 @@ static const struct comedi_lrange *dac_range_types[] = { ...@@ -224,23 +224,32 @@ static const struct comedi_lrange *dac_range_types[] = {
&range_unipolar5 &range_unipolar5
}; };
#define DT2811_TIMEOUT 5 static int dt2811_ai_eoc(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn,
unsigned long context)
{
unsigned int status;
status = inb(dev->iobase + DT2811_ADCSR);
if ((status & DT2811_ADBUSY) == 0)
return 0;
return -EBUSY;
}
static int dt2811_ai_insn(struct comedi_device *dev, struct comedi_subdevice *s, static int dt2811_ai_insn(struct comedi_device *dev, struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data) struct comedi_insn *insn, unsigned int *data)
{ {
int chan = CR_CHAN(insn->chanspec); int chan = CR_CHAN(insn->chanspec);
int timeout = DT2811_TIMEOUT; int ret;
int i; int i;
for (i = 0; i < insn->n; i++) { for (i = 0; i < insn->n; i++) {
outb(chan, dev->iobase + DT2811_ADGCR); outb(chan, dev->iobase + DT2811_ADGCR);
while (timeout ret = comedi_timeout(dev, s, insn, dt2811_ai_eoc, 0);
&& inb(dev->iobase + DT2811_ADCSR) & DT2811_ADBUSY) if (ret)
timeout--; return ret;
if (!timeout)
return -ETIME;
data[i] = inb(dev->iobase + DT2811_ADDATLO); data[i] = inb(dev->iobase + DT2811_ADDATLO);
data[i] |= inb(dev->iobase + DT2811_ADDATHI) << 8; data[i] |= inb(dev->iobase + DT2811_ADDATHI) << 8;
......
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