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

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

staging: comedi: ni_stc.h: tidy up Window_{Address,Data} defines 



Rename the CamelCase.

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 81bee07f

drivers/staging/comedi/drivers/ni_mio_common.c

+4 −4
Original line number Diff line number Diff line
@@ -469,8 +469,8 @@ static void ni_stc_writew(struct comedi_device *dev, uint16_t data, int reg) 
		if (!devpriv->mite && reg < 8) {

			ni_writew(dev, data, reg * 2);

		} else {

			ni_writew(dev, reg, Window_Address);

			ni_writew(dev, data, Window_Data);

			ni_writew(dev, reg, NI_E_STC_WINDOW_ADDR_REG);

			ni_writew(dev, data, NI_E_STC_WINDOW_DATA_REG);

		}

		spin_unlock_irqrestore(&devpriv->window_lock, flags);

	}
@@ -501,8 +501,8 @@ static uint16_t ni_stc_readw(struct comedi_device *dev, int reg) 
		if (!devpriv->mite && reg < 8) {

			val = ni_readw(dev, reg * 2);

		} else {

			ni_writew(dev, reg, Window_Address);

			val = ni_readw(dev, Window_Data);

			ni_writew(dev, reg, NI_E_STC_WINDOW_ADDR_REG);

			val = ni_readw(dev, NI_E_STC_WINDOW_DATA_REG);

		}

		spin_unlock_irqrestore(&devpriv->window_lock, flags);

	}

drivers/staging/comedi/drivers/ni_stc.h

+5 −5
Original line number Diff line number Diff line
@@ -561,11 +561,11 @@ 
#define NISTC_AI_SI_SAVE_REG		64

#define NISTC_AI_SC_SAVE_REG		66



/* Additional windowed registers unique to E series */



/* 16 bit registers shadowed from DAQ-STC */

#define Window_Address			0x00

#define Window_Data			0x02

/*

 * PCI E Series Registers

 */

#define NI_E_STC_WINDOW_ADDR_REG	0x00	/* rw16 */

#define NI_E_STC_WINDOW_DATA_REG	0x02	/* rw16 */



/* i/o port offsets */