Commit 6976a449 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: cb_pcimdas: use comedi_timeout()

Use comedi_timeout() to wait for the analog input end-of-conversion.

Remove the unnecessary comments.
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 96ed0850
...@@ -85,21 +85,31 @@ struct cb_pcimdas_private { ...@@ -85,21 +85,31 @@ struct cb_pcimdas_private {
unsigned int ao_readback[2]; unsigned int ao_readback[2];
}; };
/* static int cb_pcimdas_ai_eoc(struct comedi_device *dev,
* "instructions" read/write data in "one-shot" or "software-triggered" struct comedi_subdevice *s,
* mode. struct comedi_insn *insn,
*/ unsigned long context)
{
struct cb_pcimdas_private *devpriv = dev->private;
unsigned int status;
status = inb(devpriv->BADR3 + 2);
if ((status & 0x80) == 0)
return 0;
return -EBUSY;
}
static int cb_pcimdas_ai_rinsn(struct comedi_device *dev, static int cb_pcimdas_ai_rinsn(struct comedi_device *dev,
struct comedi_subdevice *s, struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data) struct comedi_insn *insn, unsigned int *data)
{ {
struct cb_pcimdas_private *devpriv = dev->private; struct cb_pcimdas_private *devpriv = dev->private;
int n, i; int n;
unsigned int d; unsigned int d;
unsigned int busy;
int chan = CR_CHAN(insn->chanspec); int chan = CR_CHAN(insn->chanspec);
unsigned short chanlims; unsigned short chanlims;
int maxchans; int maxchans;
int ret;
/* only support sw initiated reads from a single channel */ /* only support sw initiated reads from a single channel */
...@@ -133,17 +143,10 @@ static int cb_pcimdas_ai_rinsn(struct comedi_device *dev, ...@@ -133,17 +143,10 @@ static int cb_pcimdas_ai_rinsn(struct comedi_device *dev,
/* trigger conversion */ /* trigger conversion */
outw(0, dev->iobase + 0); outw(0, dev->iobase + 0);
#define TIMEOUT 1000 /* typically takes 5 loops on a lightly loaded Pentium 100MHz, */
/* this is likely to be 100 loops on a 2GHz machine, so set 1000 as the limit. */
/* wait for conversion to end */ /* wait for conversion to end */
for (i = 0; i < TIMEOUT; i++) { ret = comedi_timeout(dev, s, insn, cb_pcimdas_ai_eoc, 0);
busy = inb(devpriv->BADR3 + 2) & 0x80; if (ret)
if (!busy) return ret;
break;
}
if (i == TIMEOUT)
return -ETIMEDOUT;
/* read data */ /* read data */
data[n] = inw(dev->iobase + 0); data[n] = inw(dev->iobase + 0);
......
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