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

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

staging: comedi: das16m1: introduce das16m1_ai_set_queue() 



Introduce a helper function to handle writing the channel/gain data to
the queue for single channel reads, (*insn_read), and multi-channel
scans, (*do_cmd).

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 c9a050cf

drivers/staging/comedi/drivers/das16m1.c

+18 −15
Original line number Diff line number Diff line
@@ -112,6 +112,21 @@ struct das16m1_private_struct { 
	unsigned long extra_iobase;

};



static void das16m1_ai_set_queue(struct comedi_device *dev,

				 unsigned int *chanspec, unsigned int len)

{

	unsigned int i;



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

		unsigned int chan = CR_CHAN(chanspec[i]);

		unsigned int range = CR_RANGE(chanspec[i]);



		outb(i, dev->iobase + DAS16M1_Q_ADDR_REG);

		outb(DAS16M1_Q_CHAN(chan) | DAS16M1_Q_RANGE(range),

		     dev->iobase + DAS16M1_Q_REG);

	}

}



static void munge_sample_array(unsigned short *array, unsigned int num_elements)

{

	unsigned int i;
@@ -225,7 +240,7 @@ static int das16m1_cmd_exec(struct comedi_device *dev, 
	struct das16m1_private_struct *devpriv = dev->private;

	struct comedi_async *async = s->async;

	struct comedi_cmd *cmd = &async->cmd;

	unsigned int byte, i;

	unsigned int byte;



	/*  set software count */

	devpriv->adc_count = 0;
@@ -244,14 +259,7 @@ static int das16m1_cmd_exec(struct comedi_device *dev, 
	 */

	devpriv->initial_hw_count = comedi_8254_read(devpriv->counter, 1);



	/* setup channel/gain queue */

	for (i = 0; i < cmd->chanlist_len; i++) {

		outb(i, dev->iobase + DAS16M1_Q_ADDR_REG);

		byte =

		    DAS16M1_Q_CHAN(CR_CHAN(cmd->chanlist[i])) |

		    DAS16M1_Q_RANGE(CR_RANGE(cmd->chanlist[i]));

		outb(byte, dev->iobase + DAS16M1_Q_REG);

	}

	das16m1_ai_set_queue(dev, cmd->chanlist, cmd->chanlist_len);



	/* enable interrupts and set internal pacer counter mode and counts */

	devpriv->intr_ctrl &= ~DAS16M1_INTR_CTRL_PACER_MASK;
@@ -314,13 +322,8 @@ static int das16m1_ai_rinsn(struct comedi_device *dev, 
{

	int ret;

	int n;

	int byte;



	/* setup channel/gain queue */

	outb(0, dev->iobase + DAS16M1_Q_ADDR_REG);

	byte = DAS16M1_Q_CHAN(CR_CHAN(insn->chanspec)) |

	       DAS16M1_Q_RANGE(CR_RANGE(insn->chanspec));

	outb(byte, dev->iobase + DAS16M1_Q_REG);

	das16m1_ai_set_queue(dev, &insn->chanspec, 1);



	for (n = 0; n < insn->n; n++) {

		unsigned short val;