openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: comedi: me_daq: use comedi_timeout() 

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:21 -07:00 committed by Greg Kroah-Hartman
parent 7c4ede3a6b
commit 65a1c97f1e
1 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
drivers/staging/comedi/drivers/me_daq.c
View File

@ -248,6 +248,20 @@ static int me_dio_insn_bits(struct comedi_device *dev,
return insn->n;
}
static int me_ai_eoc(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn,
unsigned long context)
{
struct me_private_data *dev_private = dev->private;
unsigned int status;
status = readw(dev_private->me_regbase + ME_STATUS);
if ((status & 0x0004) == 0)
return 0;
return -EBUSY;
}
static int me_ai_insn_read(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn,
@ -258,7 +272,7 @@ static int me_ai_insn_read(struct comedi_device *dev,
unsigned int rang = CR_RANGE(insn->chanspec);
unsigned int aref = CR_AREF(insn->chanspec);
unsigned short val;
int i;
int ret;
/* stop any running conversion */
dev_private->control_1 &= 0xFFFC;
@ -290,19 +304,16 @@ static int me_ai_insn_read(struct comedi_device *dev,
readw(dev_private->me_regbase + ME_ADC_START);
/* wait for ADC fifo not empty flag */
for (i = 100000; i > 0; i--)
if (!(readw(dev_private->me_regbase + ME_STATUS) & 0x0004))
break;
ret = comedi_timeout(dev, s, insn, me_ai_eoc, 0);
if (ret) {
dev_err(dev->class_dev, "Cannot get single value\n");
return ret;
}
/* get value from ADC fifo */
if (i) {
val = readw(dev_private->me_regbase + ME_READ_AD_FIFO);
val = (val ^ 0x800) & 0x0fff;
data[0] = val;
} else {
dev_err(dev->class_dev, "Cannot get single value\n");
return -EIO;
}
val = readw(dev_private->me_regbase + ME_READ_AD_FIFO);
val = (val ^ 0x800) & 0x0fff;
data[0] = val;
/* stop any running conversion */
dev_private->control_1 &= 0xFFFC;