Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

staging: comedi: das6402: introduce das6402_ai_set_mode() 



Introduce a helper function to set the analog input acquisition mode.
This will be needed when the (*do_cmd) function is completed to support
async commands.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 594e400a

drivers/staging/comedi/drivers/das6402.c

+20 −11
Original line number Diff line number Diff line
@@ -202,6 +202,23 @@ static irqreturn_t das6402_interrupt(int irq, void *d) 
	return IRQ_HANDLED;

}



static void das6402_ai_set_mode(struct comedi_device *dev,

				struct comedi_subdevice *s,

				unsigned int chanspec,

				unsigned int mode)

{

	unsigned int range = CR_RANGE(chanspec);

	unsigned int aref = CR_AREF(chanspec);



	mode |= DAS6402_MODE_RANGE(range);

	if (aref == AREF_GROUND)

		mode |= DAS6402_MODE_SE;

	if (comedi_range_is_unipolar(s, range))

		mode |= DAS6402_MODE_UNI;



	das6402_set_mode(dev, mode);

}



static int das6402_ai_cmd(struct comedi_device *dev,

			  struct comedi_subdevice *s)

{
@@ -349,26 +366,18 @@ static int das6402_ai_insn_read(struct comedi_device *dev, 
				unsigned int *data)

{

	unsigned int chan = CR_CHAN(insn->chanspec);

	unsigned int range = CR_RANGE(insn->chanspec);

	unsigned int aref = CR_AREF(insn->chanspec);

	unsigned int val;

	int ret;

	int i;



	val = DAS6402_MODE_RANGE(range) | DAS6402_MODE_POLLED;

	if (aref == AREF_DIFF) {

		if (chan > s->n_chan / 2)

	if (aref == AREF_DIFF && chan > (s->n_chan / 2))

		return -EINVAL;

	} else {

		val |= DAS6402_MODE_SE;

	}

	if (comedi_range_is_unipolar(s, range))

		val |= DAS6402_MODE_UNI;



	/* enable software conversion trigger */

	outb(DAS6402_CTRL_SOFT_TRIG, dev->iobase + DAS6402_CTRL_REG);



	das6402_set_mode(dev, val);

	das6402_ai_set_mode(dev, s, insn->chanspec, DAS6402_MODE_POLLED);



	/* load the mux for single channel conversion */

	outw(DAS6402_AI_MUX_HI(chan) | DAS6402_AI_MUX_LO(chan),