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

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

staging: comedi: 8253.h: tidy up the i8253_cascade_ns_to_timer*() users 



Introduce a couple defines for the common 8254 oscillator base values
used in the comedi drivers and remove the custom defines and open
coded values.

Change the i8253_cascade_ns_to_timer_2div() calls in the drivers to
the more generic i8253_cascade_ns_to_timer(). They are identical due
to the #define in the 8253.h header.

Remove the extra mask by TRIG_ROUND_MASK of the 'round_mode' parameter
to i8253_cascade_ns_to_timer(). That function already handles the mask.

Tidy up all the calls to i8253_cascade_ns_to_timer().

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 fa57560c

drivers/staging/comedi/drivers/8253.h

+9 −0
Original line number Diff line number Diff line
@@ -21,6 +21,15 @@ 


#include "../comedi.h"



/*

 * Common oscillator base values in nanoseconds

 */

#define I8254_OSC_BASE_10MHZ		100

#define I8254_OSC_BASE_5MHZ		200

#define I8254_OSC_BASE_4MHZ		250

#define I8254_OSC_BASE_2MHZ		500

#define I8254_OSC_BASE_1MHZ		1000



#define i8253_cascade_ns_to_timer i8253_cascade_ns_to_timer_2div



static inline void i8253_cascade_ns_to_timer_2div_old(int i8253_osc_base,

drivers/staging/comedi/drivers/adl_pci9111.c

+4 −7
Original line number Diff line number Diff line
@@ -86,8 +86,6 @@ a multiple of chanlist_len*convert_arg. 
#define PCI9111_AI_INSTANT_READ_UDELAY_US	2

#define PCI9111_AI_INSTANT_READ_TIMEOUT		100



#define PCI9111_8254_CLOCK_PERIOD_NS		500



/*

 * IO address map and bit defines

 */
@@ -393,11 +391,10 @@ static int pci9111_ai_do_cmd_test(struct comedi_device *dev, 


	if (cmd->convert_src == TRIG_TIMER) {

		tmp = cmd->convert_arg;

		i8253_cascade_ns_to_timer_2div(PCI9111_8254_CLOCK_PERIOD_NS,

		i8253_cascade_ns_to_timer(I8254_OSC_BASE_2MHZ,

					  &dev_private->div1,

					  &dev_private->div2,

					       &cmd->convert_arg,

					       cmd->flags & TRIG_ROUND_MASK);

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

		if (tmp != cmd->convert_arg)

			error++;

	}

drivers/staging/comedi/drivers/adl_pci9118.c

+9 −8
Original line number Diff line number Diff line
@@ -792,7 +792,8 @@ static void pci9118_calc_divisors(char mode, struct comedi_device *dev, 
	case 4:

		if (*tim2 < this_board->ai_ns_min)

			*tim2 = this_board->ai_ns_min;

		i8253_cascade_ns_to_timer(devpriv->i8254_osc_base, div1, div2,

		i8253_cascade_ns_to_timer(devpriv->i8254_osc_base,

					  div1, div2,

					  tim2, flags & TRIG_ROUND_NEAREST);

		break;

	case 2:
@@ -1277,9 +1278,9 @@ static int pci9118_ai_cmdtest(struct comedi_device *dev, 


	if (cmd->scan_begin_src == TRIG_TIMER) {

		tmp = cmd->scan_begin_arg;

		i8253_cascade_ns_to_timer(devpriv->i8254_osc_base, &divisor1,

					  &divisor2, &cmd->scan_begin_arg,

					  cmd->flags & TRIG_ROUND_MASK);

		i8253_cascade_ns_to_timer(devpriv->i8254_osc_base,

					  &divisor1, &divisor2,

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

		if (cmd->scan_begin_arg < this_board->ai_ns_min)

			cmd->scan_begin_arg = this_board->ai_ns_min;

		if (tmp != cmd->scan_begin_arg)
@@ -1288,9 +1289,9 @@ static int pci9118_ai_cmdtest(struct comedi_device *dev, 


	if (cmd->convert_src & (TRIG_TIMER | TRIG_NOW)) {

		tmp = cmd->convert_arg;

		i8253_cascade_ns_to_timer(devpriv->i8254_osc_base, &divisor1,

					  &divisor2, &cmd->convert_arg,

					  cmd->flags & TRIG_ROUND_MASK);

		i8253_cascade_ns_to_timer(devpriv->i8254_osc_base,

					  &divisor1, &divisor2,

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

		if (cmd->convert_arg < this_board->ai_ns_min)

			cmd->convert_arg = this_board->ai_ns_min;

		if (tmp != cmd->convert_arg)
@@ -2086,7 +2087,7 @@ static int pci9118_common_attach(struct comedi_device *dev, int disable_irq, 
	s->insn_bits = pci9118_insn_bits_do;



	devpriv->valid = 1;

	devpriv->i8254_osc_base = 250;	/* 250ns=4MHz */

	devpriv->i8254_osc_base = I8254_OSC_BASE_4MHZ;

	devpriv->ai_maskharderr = 0x10a;

					/* default measure crash condition */

	if (hw_err_mask)		/* disable some requested */

drivers/staging/comedi/drivers/adv_pci1710.c

+8 −7
Original line number Diff line number Diff line
@@ -1005,9 +1005,10 @@ static int pci171x_ai_docmd_and_mode(int mode, struct comedi_device *dev, 
		} else {

			devpriv->ai_et = 0;

		}

		i8253_cascade_ns_to_timer(devpriv->i8254_osc_base, &divisor1,

					  &divisor2, &devpriv->ai_timer1,

					  devpriv->ai_flags & TRIG_ROUND_MASK);

		i8253_cascade_ns_to_timer(devpriv->i8254_osc_base,

					  &divisor1, &divisor2,

					  &devpriv->ai_timer1,

					  devpriv->ai_flags);

		outw(devpriv->CntrlReg, dev->iobase + PCI171x_CONTROL);

		if (mode != 2) {

			/*  start pacer */
@@ -1086,9 +1087,9 @@ static int pci171x_ai_cmdtest(struct comedi_device *dev, 


	if (cmd->convert_src == TRIG_TIMER) {

		tmp = cmd->convert_arg;

		i8253_cascade_ns_to_timer(devpriv->i8254_osc_base, &divisor1,

					  &divisor2, &cmd->convert_arg,

					  cmd->flags & TRIG_ROUND_MASK);

		i8253_cascade_ns_to_timer(devpriv->i8254_osc_base,

					  &divisor1, &divisor2,

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

		if (cmd->convert_arg < this_board->ai_ns_min)

			cmd->convert_arg = this_board->ai_ns_min;

		if (tmp != cmd->convert_arg)
@@ -1284,7 +1285,7 @@ static int pci1710_auto_attach(struct comedi_device *dev, 
			s->do_cmdtest = pci171x_ai_cmdtest;

			s->do_cmd = pci171x_ai_cmd;

		}

		devpriv->i8254_osc_base = 100;	/*  100ns=10MHz */

		devpriv->i8254_osc_base = I8254_OSC_BASE_10MHZ;

		subdev++;

	}

drivers/staging/comedi/drivers/amplc_pci224.c

+16 −20
Original line number Diff line number Diff line
@@ -215,12 +215,6 @@ Passing a zero for an option is the same as leaving it unspecified. 
#define CLK_EXT		7	/* external clock */

/* Macro to construct clock input configuration register value. */

#define CLK_CONFIG(chan, src)	((((chan) & 3) << 3) | ((src) & 7))

/* Timebases in ns. */

#define TIMEBASE_10MHZ		100

#define TIMEBASE_1MHZ		1000

#define TIMEBASE_100KHZ		10000

#define TIMEBASE_10KHZ		100000

#define TIMEBASE_1KHZ		1000000



/*

 * Counter/timer gate input configuration sources.
@@ -843,26 +837,26 @@ pci224_ao_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, 
		switch (round_mode) {

		case TRIG_ROUND_NEAREST:

		default:

			round = TIMEBASE_10MHZ / 2;

			round = I8254_OSC_BASE_10MHZ / 2;

			break;

		case TRIG_ROUND_DOWN:

			round = 0;

			break;

		case TRIG_ROUND_UP:

			round = TIMEBASE_10MHZ - 1;

			round = I8254_OSC_BASE_10MHZ - 1;

			break;

		}

		/* Be careful to avoid overflow! */

		div2 = cmd->scan_begin_arg / TIMEBASE_10MHZ;

		div2 += (round + cmd->scan_begin_arg % TIMEBASE_10MHZ) /

		    TIMEBASE_10MHZ;

		div2 = cmd->scan_begin_arg / I8254_OSC_BASE_10MHZ;

		div2 += (round + cmd->scan_begin_arg % I8254_OSC_BASE_10MHZ) /

			I8254_OSC_BASE_10MHZ;

		if (div2 <= 0x10000) {

			/* A single timer will suffice. */

			if (div2 < 2)

				div2 = 2;

			cmd->scan_begin_arg = div2 * TIMEBASE_10MHZ;

			cmd->scan_begin_arg = div2 * I8254_OSC_BASE_10MHZ;

			if (cmd->scan_begin_arg < div2 ||

			    cmd->scan_begin_arg < TIMEBASE_10MHZ) {

			    cmd->scan_begin_arg < I8254_OSC_BASE_10MHZ) {

				/* Overflow! */

				cmd->scan_begin_arg = MAX_SCAN_PERIOD;

			}
@@ -870,7 +864,8 @@ pci224_ao_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, 
			/* Use two timers. */

			div1 = devpriv->cached_div1;

			div2 = devpriv->cached_div2;

			pci224_cascade_ns_to_timer(TIMEBASE_10MHZ, &div1, &div2,

			pci224_cascade_ns_to_timer(I8254_OSC_BASE_10MHZ,

						   &div1, &div2,

						   &cmd->scan_begin_arg,

						   round_mode);

			devpriv->cached_div1 = div1;
@@ -1002,19 +997,19 @@ static int pci224_ao_cmd(struct comedi_device *dev, struct comedi_subdevice *s) 
		switch (round_mode) {

		case TRIG_ROUND_NEAREST:

		default:

			round = TIMEBASE_10MHZ / 2;

			round = I8254_OSC_BASE_10MHZ / 2;

			break;

		case TRIG_ROUND_DOWN:

			round = 0;

			break;

		case TRIG_ROUND_UP:

			round = TIMEBASE_10MHZ - 1;

			round = I8254_OSC_BASE_10MHZ - 1;

			break;

		}

		/* Be careful to avoid overflow! */

		div2 = cmd->scan_begin_arg / TIMEBASE_10MHZ;

		div2 += (round + cmd->scan_begin_arg % TIMEBASE_10MHZ) /

		    TIMEBASE_10MHZ;

		div2 = cmd->scan_begin_arg / I8254_OSC_BASE_10MHZ;

		div2 += (round + cmd->scan_begin_arg % I8254_OSC_BASE_10MHZ) /

			I8254_OSC_BASE_10MHZ;

		if (div2 <= 0x10000) {

			/* A single timer will suffice. */

			if (div2 < 2)
@@ -1025,7 +1020,8 @@ static int pci224_ao_cmd(struct comedi_device *dev, struct comedi_subdevice *s) 
			/* Use two timers. */

			div1 = devpriv->cached_div1;

			div2 = devpriv->cached_div2;

			pci224_cascade_ns_to_timer(TIMEBASE_10MHZ, &div1, &div2,

			pci224_cascade_ns_to_timer(I8254_OSC_BASE_10MHZ,

						   &div1, &div2,

						   &ns, round_mode);

		}