diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2014-02-10 19:49:41 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-14 18:28:46 +0100 |
| commit | c0c3531b59c9ef27760c941b0206a6074699d3b6 (patch) | |
| tree | 001571916ba9c82a5a3e14d3e3be7ef113d18d3e | |
| parent | staging: comedi: pcl812: use comedi_timeout() (diff) | |
| download | linux-c0c3531b59c9ef27760c941b0206a6074699d3b6.tar.xz linux-c0c3531b59c9ef27760c941b0206a6074699d3b6.zip | |
staging: comedi: pcl816: 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>
| -rw-r--r-- | drivers/staging/comedi/drivers/pcl816.c | 45 |
1 files changed, 22 insertions, 23 deletions
diff --git a/drivers/staging/comedi/drivers/pcl816.c b/drivers/staging/comedi/drivers/pcl816.c index e9d470459933..db00d079c9c9 100644 --- a/drivers/staging/comedi/drivers/pcl816.c +++ b/drivers/staging/comedi/drivers/pcl816.c @@ -160,16 +160,25 @@ static int pcl816_ai_cmdtest(struct comedi_device *dev, struct comedi_cmd *cmd); static int pcl816_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s); -/* -============================================================================== - ANALOG INPUT MODE0, 816 cards, slow version -*/ +static int pcl816_ai_eoc(struct comedi_device *dev, + struct comedi_subdevice *s, + struct comedi_insn *insn, + unsigned long context) +{ + unsigned int status; + + status = inb(dev->iobase + PCL816_STATUS); + if ((status & PCL816_STATUS_DRDY_MASK) == 0) + return 0; + return -EBUSY; +} + static int pcl816_ai_insn_read(struct comedi_device *dev, struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) { + int ret; int n; - int timeout; /* software trigger, DMA and INT off */ outb(0, dev->iobase + PCL816_CONTROL); @@ -185,30 +194,20 @@ static int pcl816_ai_insn_read(struct comedi_device *dev, outb(0, dev->iobase + PCL816_AD_LO); /* start conversion */ - timeout = 100; - while (timeout--) { - if (!(inb(dev->iobase + PCL816_STATUS) & - PCL816_STATUS_DRDY_MASK)) { - /* return read value */ - data[n] = - ((inb(dev->iobase + - PCL816_AD_HI) << 8) | - (inb(dev->iobase + PCL816_AD_LO))); - /* clear INT (conversion end) flag */ - outb(0, dev->iobase + PCL816_CLRINT); - break; - } - udelay(1); - } - /* Return timeout error */ - if (!timeout) { + ret = comedi_timeout(dev, s, insn, pcl816_ai_eoc, 0); + if (ret) { comedi_error(dev, "A/D insn timeout\n"); data[0] = 0; /* clear INT (conversion end) flag */ outb(0, dev->iobase + PCL816_CLRINT); - return -EIO; + return ret; } + /* return read value */ + data[n] = ((inb(dev->iobase + PCL816_AD_HI) << 8) | + (inb(dev->iobase + PCL816_AD_LO))); + /* clear INT (conversion end) flag */ + outb(0, dev->iobase + PCL816_CLRINT); } return n; } |