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

staging: comedi: pcmmio: use comedi_timeout()

Browse Source 
Use comedi_timeout() to wait for the analog input and output end-of-
conversions.

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:10 -07:00 committed by Greg Kroah-Hartman
parent 42946cfc55
commit 6fd13f761c
1 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
drivers/staging/comedi/drivers/pcmmio.c
View File

@ -589,16 +589,17 @@ static int pcmmio_cmdtest(struct comedi_device *dev,
return 0; return 0;
} }
static int pcmmio_ai_wait_for_eoc(unsigned long iobase, unsigned int timeout) static int pcmmio_ai_eoc(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn,
unsigned long context)
{ {
unsigned char status; unsigned char status;
while (timeout--) { status = inb(dev->iobase + PCMMIO_AI_STATUS_REG);
status = inb(iobase + PCMMIO_AI_STATUS_REG); if (status & PCMMIO_AI_STATUS_DATA_READY)
if (status & PCMMIO_AI_STATUS_DATA_READY) return 0;
return 0; return -EBUSY;
}
return -ETIME;
} }
static int pcmmio_ai_insn_read(struct comedi_device *dev, static int pcmmio_ai_insn_read(struct comedi_device *dev,
@ -643,7 +644,8 @@ static int pcmmio_ai_insn_read(struct comedi_device *dev,
cmd |= PCMMIO_AI_CMD_RANGE(range); cmd |= PCMMIO_AI_CMD_RANGE(range);
outb(cmd, iobase + PCMMIO_AI_CMD_REG); outb(cmd, iobase + PCMMIO_AI_CMD_REG);
ret = pcmmio_ai_wait_for_eoc(iobase, 100000);
ret = comedi_timeout(dev, s, insn, pcmmio_ai_eoc, 0);
if (ret) if (ret)
return ret; return ret;
@ -652,7 +654,8 @@ static int pcmmio_ai_insn_read(struct comedi_device *dev,
for (i = 0; i < insn->n; i++) { for (i = 0; i < insn->n; i++) {
outb(cmd, iobase + PCMMIO_AI_CMD_REG); outb(cmd, iobase + PCMMIO_AI_CMD_REG);
ret = pcmmio_ai_wait_for_eoc(iobase, 100000);
ret = comedi_timeout(dev, s, insn, pcmmio_ai_eoc, 0);
if (ret) if (ret)
return ret; return ret;
@ -684,16 +687,17 @@ static int pcmmio_ao_insn_read(struct comedi_device *dev,
return insn->n; return insn->n;
} }
static int pcmmio_ao_wait_for_eoc(unsigned long iobase, unsigned int timeout) static int pcmmio_ao_eoc(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn,
unsigned long context)
{ {
unsigned char status; unsigned char status;
while (timeout--) { status = inb(dev->iobase + PCMMIO_AO_STATUS_REG);
status = inb(iobase + PCMMIO_AO_STATUS_REG); if (status & PCMMIO_AO_STATUS_DATA_READY)
if (status & PCMMIO_AO_STATUS_DATA_READY) return 0;
return 0; return -EBUSY;
}
return -ETIME;
} }
static int pcmmio_ao_insn_write(struct comedi_device *dev, static int pcmmio_ao_insn_write(struct comedi_device *dev,
@ -726,7 +730,8 @@ static int pcmmio_ao_insn_write(struct comedi_device *dev,
outb(PCMMIO_AO_LSB_SPAN(range), iobase + PCMMIO_AO_LSB_REG); outb(PCMMIO_AO_LSB_SPAN(range), iobase + PCMMIO_AO_LSB_REG);
outb(0, iobase + PCMMIO_AO_MSB_REG); outb(0, iobase + PCMMIO_AO_MSB_REG);
outb(cmd | PCMMIO_AO_CMD_WR_SPAN_UPDATE, iobase + PCMMIO_AO_CMD_REG); outb(cmd | PCMMIO_AO_CMD_WR_SPAN_UPDATE, iobase + PCMMIO_AO_CMD_REG);
ret = pcmmio_ao_wait_for_eoc(iobase, 100000);
ret = comedi_timeout(dev, s, insn, pcmmio_ao_eoc, 0);
if (ret) if (ret)
return ret; return ret;
@ -738,7 +743,8 @@ static int pcmmio_ao_insn_write(struct comedi_device *dev,
outb((val >> 8) & 0xff, iobase + PCMMIO_AO_MSB_REG); outb((val >> 8) & 0xff, iobase + PCMMIO_AO_MSB_REG);
outb(cmd | PCMMIO_AO_CMD_WR_CODE_UPDATE, outb(cmd | PCMMIO_AO_CMD_WR_CODE_UPDATE,
iobase + PCMMIO_AO_CMD_REG); iobase + PCMMIO_AO_CMD_REG);
ret = pcmmio_ao_wait_for_eoc(iobase, 100000);
ret = comedi_timeout(dev, s, insn, pcmmio_ao_eoc, 0);
if (ret) if (ret)
return ret; return ret;