diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2015-05-01 14:59:57 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-05-09 19:05:17 +0200 |
| commit | 76efac7f525f2e9fffe9e751c29cd93aae96c710 (patch) | |
| tree | 4db950761d87784838aa3a1ad948b2c69ee6530a /drivers | |
| parent | 363f570ef0e4a5361e97a1c0632e17c5d4148ec8 (diff) | |
staging: comedi: ni_stc.h: tidy up Configuration_Memory_Low register and bits
Rename the CamelCase. Use the BIT() macro to define the bits.
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_mio_common.c | 9 | ||||
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_stc.h | 12 |
2 files changed, 11 insertions, 10 deletions
diff --git a/drivers/staging/comedi/drivers/ni_mio_common.c b/drivers/staging/comedi/drivers/ni_mio_common.c index 74817f8a2728..0fba36dabd5b 100644 --- a/drivers/staging/comedi/drivers/ni_mio_common.c +++ b/drivers/staging/comedi/drivers/ni_mio_common.c @@ -1902,13 +1902,14 @@ static void ni_load_channelgain_list(struct comedi_device *dev, ni_writew(dev, hi, Configuration_Memory_High); if (!devpriv->is_6143) { - lo = range; + lo = NI_E_AI_CFG_LO_GAIN(range); + if (i == n_chan - 1) - lo |= AI_LAST_CHANNEL; + lo |= NI_E_AI_CFG_LO_LAST_CHAN; if (dither) - lo |= AI_DITHER; + lo |= NI_E_AI_CFG_LO_DITHER; - ni_writew(dev, lo, Configuration_Memory_Low); + ni_writew(dev, lo, NI_E_AI_CFG_LO_REG); } } diff --git a/drivers/staging/comedi/drivers/ni_stc.h b/drivers/staging/comedi/drivers/ni_stc.h index ea5999c8a907..8abf78db47bc 100644 --- a/drivers/staging/comedi/drivers/ni_stc.h +++ b/drivers/staging/comedi/drivers/ni_stc.h @@ -616,13 +616,13 @@ static inline unsigned GPCT_DMA_Select_Mask(unsigned gpct_index) return 0xf << (4 * gpct_index); } -/* 16 bit registers */ +#define NI_E_AI_CFG_LO_REG 0x10 /* w16 */ +#define NI_E_AI_CFG_LO_LAST_CHAN BIT(15) +#define NI_E_AI_CFG_LO_GEN_TRIG BIT(12) +#define NI_E_AI_CFG_LO_DITHER BIT(9) +#define NI_E_AI_CFG_LO_UNI BIT(8) +#define NI_E_AI_CFG_LO_GAIN(x) ((x) << 0) -#define Configuration_Memory_Low 0x10 -enum Configuration_Memory_Low_Bits { - AI_DITHER = 0x200, - AI_LAST_CHANNEL = 0x8000, -}; #define Configuration_Memory_High 0x12 enum Configuration_Memory_High_Bits { AI_AC_COUPLE = 0x800, |