leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: comedi: cb_das16_cs: 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:14 -07:00 committed by Greg Kroah-Hartman
parent 0862a46f17
commit e467bc37df
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/staging/comedi/drivers/cb_das16_cs.c
View File

@ -101,6 +101,19 @@ static irqreturn_t das16cs_interrupt(int irq, void *d)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static int das16cs_ai_eoc(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn,
unsigned long context)
{
unsigned int status;
status = inw(dev->iobase + DAS16CS_MISC1);
if (status & 0x0080)
return 0;
return -EBUSY;
}
static int das16cs_ai_rinsn(struct comedi_device *dev, static int das16cs_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)
@ -109,8 +122,8 @@ static int das16cs_ai_rinsn(struct comedi_device *dev,
int chan = CR_CHAN(insn->chanspec); int chan = CR_CHAN(insn->chanspec);
int range = CR_RANGE(insn->chanspec); int range = CR_RANGE(insn->chanspec);
int aref = CR_AREF(insn->chanspec); int aref = CR_AREF(insn->chanspec);
int ret;
int i; int i;
int to;
outw(chan, dev->iobase + DAS16CS_DIO_MUX); outw(chan, dev->iobase + DAS16CS_DIO_MUX);
@ -138,15 +151,12 @@ static int das16cs_ai_rinsn(struct comedi_device *dev,
for (i = 0; i < insn->n; i++) { for (i = 0; i < insn->n; i++) {
outw(0, dev->iobase + DAS16CS_ADC_DATA); outw(0, dev->iobase + DAS16CS_ADC_DATA);
#define TIMEOUT 1000 ret = comedi_timeout(dev, s, insn, das16cs_ai_eoc, 0);
for (to = 0; to < TIMEOUT; to++) { if (ret) {
if (inw(dev->iobase + DAS16CS_MISC1) & 0x0080)
break;
}
if (to == TIMEOUT) {
dev_dbg(dev->class_dev, "cb_das16_cs: ai timeout\n"); dev_dbg(dev->class_dev, "cb_das16_cs: ai timeout\n");
return -ETIME; return ret;
} }
data[i] = inw(dev->iobase + DAS16CS_ADC_DATA); data[i] = inw(dev->iobase + DAS16CS_ADC_DATA);
} }