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

staging: comedi: icp_multi: use comedi_timeout() 



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

Use break to exit the loop when a timeout occurs during the analog
input read so that common code can be used to disable the device.

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 443e6d02

drivers/staging/comedi/drivers/icp_multi.c

+54 −50
Original line number Diff line number Diff line
@@ -171,12 +171,27 @@ static void setup_channel_list(struct comedi_device *dev, 
	}

}



static int icp_multi_ai_eoc(struct comedi_device *dev,

			    struct comedi_subdevice *s,

			    struct comedi_insn *insn,

			    unsigned long context)

{

	struct icp_multi_private *devpriv = dev->private;

	unsigned int status;



	status = readw(devpriv->io_addr + ICP_MULTI_ADC_CSR);

	if ((status & ADC_BSY) == 0)

		return 0;

	return -EBUSY;

}



static int icp_multi_insn_read_ai(struct comedi_device *dev,

				  struct comedi_subdevice *s,

				  struct comedi_insn *insn, unsigned int *data)

{

	struct icp_multi_private *devpriv = dev->private;

	int n, timeout;

	int ret = 0;

	int n;



	/*  Disable A/D conversion ready interrupt */

	devpriv->IntEnable &= ~ADC_READY;
@@ -199,33 +214,14 @@ static int icp_multi_insn_read_ai(struct comedi_device *dev, 
		udelay(1);



		/*  Wait for conversion to complete, or get fed up waiting */

		timeout = 100;

		while (timeout--) {

			if (!(readw(devpriv->io_addr +

				    ICP_MULTI_ADC_CSR) & ADC_BSY))

				goto conv_finish;



			udelay(1);

		}



		/*  If we reach here, a timeout has occurred */

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

		if (ret) {

			comedi_error(dev, "A/D insn timeout");



		/*  Disable interrupt */

		devpriv->IntEnable &= ~ADC_READY;

		writew(devpriv->IntEnable, devpriv->io_addr + ICP_MULTI_INT_EN);



		/*  Clear interrupt status */

		devpriv->IntStatus |= ADC_READY;

		writew(devpriv->IntStatus,

		       devpriv->io_addr + ICP_MULTI_INT_STAT);



			/*  Clear data received */

			data[n] = 0;

			break;

		}



		return -ETIME;



conv_finish:

		data[n] =

		    (readw(devpriv->io_addr + ICP_MULTI_AI) >> 4) & 0x0fff;

	}
@@ -238,7 +234,21 @@ conv_finish: 
	devpriv->IntStatus |= ADC_READY;

	writew(devpriv->IntStatus, devpriv->io_addr + ICP_MULTI_INT_STAT);



	return n;

	return ret ? ret : n;

}



static int icp_multi_ao_eoc(struct comedi_device *dev,

			    struct comedi_subdevice *s,

			    struct comedi_insn *insn,

			    unsigned long context)

{

	struct icp_multi_private *devpriv = dev->private;

	unsigned int status;



	status = readw(devpriv->io_addr + ICP_MULTI_DAC_CSR);

	if ((status & DAC_BSY) == 0)

		return 0;

	return -EBUSY;

}



static int icp_multi_insn_write_ao(struct comedi_device *dev,
@@ -246,7 +256,8 @@ static int icp_multi_insn_write_ao(struct comedi_device *dev, 
				   struct comedi_insn *insn, unsigned int *data)

{

	struct icp_multi_private *devpriv = dev->private;

	int n, chan, range, timeout;

	int n, chan, range;

	int ret;



	/*  Disable D/A conversion ready interrupt */

	devpriv->IntEnable &= ~DAC_READY;
@@ -274,21 +285,14 @@ static int icp_multi_insn_write_ao(struct comedi_device *dev, 
	for (n = 0; n < insn->n; n++) {

		/*  Wait for analogue output data register to be

		 *  ready for new data, or get fed up waiting */

		timeout = 100;

		while (timeout--) {

			if (!(readw(devpriv->io_addr +

				    ICP_MULTI_DAC_CSR) & DAC_BSY))

				goto dac_ready;



			udelay(1);

		}



		/*  If we reach here, a timeout has occurred */

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

		if (ret) {

			comedi_error(dev, "D/A insn timeout");



			/*  Disable interrupt */

			devpriv->IntEnable &= ~DAC_READY;

		writew(devpriv->IntEnable, devpriv->io_addr + ICP_MULTI_INT_EN);

			writew(devpriv->IntEnable,

			       devpriv->io_addr + ICP_MULTI_INT_EN);



			/*  Clear interrupt status */

			devpriv->IntStatus |= DAC_READY;
@@ -298,9 +302,9 @@ static int icp_multi_insn_write_ao(struct comedi_device *dev, 
			/*  Clear data received */

			devpriv->ao_data[chan] = 0;



		return -ETIME;

			return ret;

		}



dac_ready:

		/*  Write data to analogue output data register */

		writew(data[n], devpriv->io_addr + ICP_MULTI_AO);

CRA Git | Maintained and supported by SUSTech CRA and CCSE