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

staging: comedi: adl_pci9118: 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 5e1a65ae
...@@ -571,12 +571,26 @@ static int setup_channel_list(struct comedi_device *dev, ...@@ -571,12 +571,26 @@ static int setup_channel_list(struct comedi_device *dev,
return 1; /* we can serve this with scan logic */ return 1; /* we can serve this with scan logic */
} }
static int pci9118_ai_eoc(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn,
unsigned long context)
{
unsigned int status;
status = inl(dev->iobase + PCI9118_ADSTAT);
if (status & AdStatus_ADrdy)
return 0;
return -EBUSY;
}
static int pci9118_insn_read_ai(struct comedi_device *dev, static int pci9118_insn_read_ai(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 pci9118_private *devpriv = dev->private; struct pci9118_private *devpriv = dev->private;
int n, timeout; int ret;
int n;
devpriv->AdControlReg = AdControl_Int & 0xff; devpriv->AdControlReg = AdControl_Int & 0xff;
devpriv->AdFunctionReg = AdFunction_PDTrg | AdFunction_PETrg; devpriv->AdFunctionReg = AdFunction_PDTrg | AdFunction_PETrg;
...@@ -597,19 +611,15 @@ static int pci9118_insn_read_ai(struct comedi_device *dev, ...@@ -597,19 +611,15 @@ static int pci9118_insn_read_ai(struct comedi_device *dev,
for (n = 0; n < insn->n; n++) { for (n = 0; n < insn->n; n++) {
outw(0, dev->iobase + PCI9118_SOFTTRG); /* start conversion */ outw(0, dev->iobase + PCI9118_SOFTTRG); /* start conversion */
udelay(2); udelay(2);
timeout = 100;
while (timeout--) {
if (inl(dev->iobase + PCI9118_ADSTAT) & AdStatus_ADrdy)
goto conv_finish;
udelay(1);
}
comedi_error(dev, "A/D insn timeout"); ret = comedi_timeout(dev, s, insn, pci9118_ai_eoc, 0);
data[n] = 0; if (ret) {
outl(0, dev->iobase + PCI9118_DELFIFO); /* flush FIFO */ comedi_error(dev, "A/D insn timeout");
return -ETIME; data[n] = 0;
outl(0, dev->iobase + PCI9118_DELFIFO); /* flush FIFO */
return ret;
}
conv_finish:
if (devpriv->ai16bits) { if (devpriv->ai16bits) {
data[n] = data[n] =
(inl(dev->iobase + (inl(dev->iobase +
......
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