Commit c3ce086e authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

staging: comedi: das08: use comedi_timeout() 



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

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6976a449

drivers/staging/comedi/drivers/das08.c

+18 −8
Original line number Diff line number Diff line
@@ -201,17 +201,29 @@ static const int *const das08_gainlists[] = { 
	das08_pgm_gainlist,

};



#define TIMEOUT 100000

static int das08_ai_eoc(struct comedi_device *dev,

			struct comedi_subdevice *s,

			struct comedi_insn *insn,

			unsigned long context)

{

	unsigned int status;



	status = inb(dev->iobase + DAS08_STATUS);

	if ((status & DAS08_EOC) == 0)

		return 0;

	return -EBUSY;

}



static int das08_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s,

			  struct comedi_insn *insn, unsigned int *data)

{

	const struct das08_board_struct *thisboard = comedi_board(dev);

	struct das08_private_struct *devpriv = dev->private;

	int i, n;

	int n;

	int chan;

	int range;

	int lsb, msb;

	int ret;



	chan = CR_CHAN(insn->chanspec);

	range = CR_RANGE(insn->chanspec);
@@ -244,14 +256,12 @@ static int das08_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, 
		/* trigger conversion */

		outb_p(0, dev->iobase + DAS08_TRIG_12BIT);



		for (i = 0; i < TIMEOUT; i++) {

			if (!(inb(dev->iobase + DAS08_STATUS) & DAS08_EOC))

				break;

		}

		if (i == TIMEOUT) {

		ret = comedi_timeout(dev, s, insn, das08_ai_eoc, 0);

		if (ret) {

			dev_err(dev->class_dev, "timeout\n");

			return -ETIME;

			return ret;

		}



		msb = inb(dev->iobase + DAS08_MSB);

		lsb = inb(dev->iobase + DAS08_LSB);

		if (thisboard->ai_encoding == das08_encode12) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE