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

staging: comedi: cb_pcidas: don't calc ao pacer divisors twice 



The analog output async command can use the pacer for the scan_begin_src.
The (*do_cmdtest) calculates the divisors when validating the cmd argument.

There is no reason to recalc the divisors in the (*do_cmd). Just use the
values from the private data.

For aesthetics, factor out the code that loads the counters to match the
analog input. Refactor the code to use the i8254_set_mode() and i8254_write()
helpers instead of i8254_load(). This allows us to use the I8254_* defines
when setting the mode to clarify the code.

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 f513b63f

drivers/staging/comedi/drivers/cb_pcidas.c

+16 −13
Original line number Diff line number Diff line
@@ -943,7 +943,7 @@ static int cb_pcidas_ai_cmdtest(struct comedi_device *dev, 
	return 0;

}



static void cb_pcidas_load_counters(struct comedi_device *dev)

static void cb_pcidas_ai_load_counters(struct comedi_device *dev)

{

	struct cb_pcidas_private *devpriv = dev->private;

	unsigned long timer_base = devpriv->pacer_counter_dio + ADC8254;
@@ -991,7 +991,7 @@ static int cb_pcidas_ai_cmd(struct comedi_device *dev, 


	/*  load counters */

	if (cmd->scan_begin_src == TRIG_TIMER || cmd->convert_src == TRIG_TIMER)

		cb_pcidas_load_counters(dev);

		cb_pcidas_ai_load_counters(dev);



	/*  set number of conversions */

	if (cmd->stop_src == TRIG_COUNT)
@@ -1196,6 +1196,18 @@ static int cb_pcidas_ao_inttrig(struct comedi_device *dev, 
	return 0;

}



static void cb_pcidas_ao_load_counters(struct comedi_device *dev)

{

	struct cb_pcidas_private *devpriv = dev->private;

	unsigned long timer_base = devpriv->pacer_counter_dio + DAC8254;



	i8254_set_mode(timer_base, 0, 1, I8254_MODE2 | I8254_BINARY);

	i8254_set_mode(timer_base, 0, 2, I8254_MODE2 | I8254_BINARY);



	i8254_write(timer_base, 0, 1, devpriv->ao_divisor1);

	i8254_write(timer_base, 0, 2, devpriv->ao_divisor2);

}



static int cb_pcidas_ao_cmd(struct comedi_device *dev,

			    struct comedi_subdevice *s)

{
@@ -1225,18 +1237,9 @@ static int cb_pcidas_ao_cmd(struct comedi_device *dev, 
	outw(0, devpriv->ao_registers + DACFIFOCLR);



	/*  load counters */

	if (cmd->scan_begin_src == TRIG_TIMER) {

		i8253_cascade_ns_to_timer(I8254_OSC_BASE_10MHZ,

					  &devpriv->ao_divisor1,

					  &devpriv->ao_divisor2,

					  &cmd->scan_begin_arg, cmd->flags);

	if (cmd->scan_begin_src == TRIG_TIMER)

		cb_pcidas_ao_load_counters(dev);



		/* Write the values of ctr1 and ctr2 into counters 1 and 2 */

		i8254_load(devpriv->pacer_counter_dio + DAC8254, 0, 1,

			   devpriv->ao_divisor1, 2);

		i8254_load(devpriv->pacer_counter_dio + DAC8254, 0, 2,

			   devpriv->ao_divisor2, 2);

	}

	/*  set number of conversions */

	if (cmd->stop_src == TRIG_COUNT)

		devpriv->ao_count = cmd->chanlist_len * cmd->stop_arg;

CRA Git | Maintained and supported by SUSTech CRA and CCSE