evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: comedi: ni_daq_700: use comedi_timeout()

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

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2014-02-10 11:49:35 -07:00 • committed by Greg Kroah-Hartman
parent f7d108f324
commit a9f9d83145
1 changed files with 33 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
drivers/staging/comedi/drivers/ni_daq_700.c
View file

@ -109,14 +109,31 @@ static int daq700_dio_insn_config(struct comedi_device *dev,
return insn->n; return insn->n;
} }
static int daq700_ai_eoc(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn,
unsigned long context)
{
unsigned int status;
status = inb(dev->iobase + STA_R2);
if ((status & 0x03))
return -EOVERFLOW;
status = inb(dev->iobase + STA_R1);
if ((status & 0x02))
return -ENODATA;
if ((status & 0x11) == 0x01)
return 0;
return -EBUSY;
}
static int daq700_ai_rinsn(struct comedi_device *dev, static int daq700_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)
{ {
int n, i, chan; int n, chan;
int d; int d;
unsigned int status; int ret;
enum { TIMEOUT = 100 };
chan = CR_CHAN(insn->chanspec); chan = CR_CHAN(insn->chanspec);
/* write channel to multiplexer */ /* write channel to multiplexer */
@ -130,30 +147,26 @@ static int daq700_ai_rinsn(struct comedi_device *dev,
outb(0x30, dev->iobase + CMO_R); /* mode 0 out0 L, from H */ outb(0x30, dev->iobase + CMO_R); /* mode 0 out0 L, from H */
/* mode 1 out0 H, L to H, start conversion */ /* mode 1 out0 H, L to H, start conversion */
outb(0x32, dev->iobase + CMO_R); outb(0x32, dev->iobase + CMO_R);
/* wait for conversion to end */ /* wait for conversion to end */
for (i = 0; i < TIMEOUT; i++) { ret = comedi_timeout(dev, s, insn, daq700_ai_eoc, 0);
status = inb(dev->iobase + STA_R2); if (ret) {
if ((status & 0x03) != 0) { switch (ret) {
case -EOVERFLOW:
dev_info(dev->class_dev, dev_info(dev->class_dev,
"Overflow/run Error\n"); "Overflow/run Error\n");
return -EOVERFLOW; break;
} case -ENODATA:
status = inb(dev->iobase + STA_R1);
if ((status & 0x02) != 0) {
dev_info(dev->class_dev, "Data Error\n"); dev_info(dev->class_dev, "Data Error\n");
return -ENODATA; break;
} default:
if ((status & 0x11) == 0x01) { dev_info(dev->class_dev,
/* ADC conversion complete */ "timeout during ADC conversion\n");
break; break;
} }
udelay(1); return ret;
}
if (i == TIMEOUT) {
dev_info(dev->class_dev,
"timeout during ADC conversion\n");
return -ETIMEDOUT;
} }
/* read data */ /* read data */
d = inw(dev->iobase + ADFIFO_R); d = inw(dev->iobase + ADFIFO_R);
/* mangle the data as necessary */ /* mangle the data as necessary */