staging: comedi: ni_at_ao: fix 8254 timer programming (4f161fc7) · Commits · 戴 / test

As pointed out by Ian Abbott, the i8254_load() function does not use the I8254_MODE* values to specify the "mode". Refactor the 8254 timer programming to use the i8254_set_mode() and i8254_write() helpers instead of i8254_load(). This allows us to use the I8254_MODE* defines to clarify the code. Signed-off-by:

H Hartley Sweeten <hsweeten@visionengravers.com> Reviewed-by:

Ian Abbott <abbotti@mev.co.uk> Signed-off-by:

Greg Kroah-Hartman <gregkh@linuxfoundation.org>

drivers/staging/comedi/drivers/ni_at_ao.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -310,6 +310,7 @@ static int atao_calib_insn_read(struct comedi_device *dev,
		static void atao_reset(struct comedi_device *dev)
		{
		struct atao_private *devpriv = dev->private;
		unsigned long timer_base = dev->iobase + ATAO_82C53_BASE;

		/* This is the reset sequence described in the manual */

		@@ -317,10 +318,9 @@ static void atao_reset(struct comedi_device *dev)
		outw(devpriv->cfg1, dev->iobase + ATAO_CFG1_REG);

		/* Put outputs of counter 1 and counter 2 in a high state */
		i8254_load(dev->iobase + ATAO_82C53_BASE, 0,
		0, 0x0003, I8254_MODE4 \| I8254_BINARY);
		i8254_set_mode(dev->iobase + ATAO_82C53_BASE, 0,
		1, I8254_MODE4 \| I8254_BINARY);
		i8254_set_mode(timer_base, 0, 0, I8254_MODE4 \| I8254_BINARY);
		i8254_set_mode(timer_base, 0, 1, I8254_MODE4 \| I8254_BINARY);
		i8254_write(timer_base, 0, 0, 0x0003);

		outw(ATAO_CFG2_CALLD_NOP, dev->iobase + ATAO_CFG2_REG);

Admin message