diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2015-05-01 15:00:03 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-05-09 19:05:18 +0200 |
| commit | a4b7ef9d8eae56f0355d0ee2a762639901d7bef4 (patch) | |
| tree | 981cbe1ff38eedd1c1f525f79ac1ff519379d6f1 /drivers/staging/comedi/drivers/ni_stc.h | |
| parent | 3446b08e83eb152fe97c791d16cbc68523a62bce (diff) | |
staging: comedi: ni_stc.h: tidy up AI_AO_Select register and bits
Rename the CamelCase and convert the enum into macros.
Tidy up the driver code to use the new macros.
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/staging/comedi/drivers/ni_stc.h')
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_stc.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/staging/comedi/drivers/ni_stc.h b/drivers/staging/comedi/drivers/ni_stc.h index 9ce4c5639923..2db29a14b2ec 100644 --- a/drivers/staging/comedi/drivers/ni_stc.h +++ b/drivers/staging/comedi/drivers/ni_stc.h @@ -571,6 +571,12 @@ #define NI_E_STATUS_AI_FIFO_LOWER_NE BIT(3) #define NI_E_STATUS_PROMOUT BIT(0) +#define NI_E_DMA_AI_AO_SEL_REG 0x09 /* w8 */ +#define NI_E_DMA_AI_SEL(x) (((x) & 0xf) << 0) +#define NI_E_DMA_AI_SEL_MASK NI_E_DMA_AI_SEL(0xf) +#define NI_E_DMA_AO_SEL(x) (((x) & 0xf) << 4) +#define NI_E_DMA_AO_SEL_MASK NI_E_DMA_AO_SEL(0xf) + #define NI_E_SERIAL_CMD_REG 0x0d /* w8 */ #define NI_E_SERIAL_CMD_DAC_LD(x) BIT(3 + (x)) #define NI_E_SERIAL_CMD_EEPROM_CS BIT(2) @@ -582,13 +588,6 @@ #define NI_E_MISC_CMD_EXT_ATRIG NI_E_MISC_CMD_INTEXT_ATRIG(0) #define NI_E_MISC_CMD_INT_ATRIG NI_E_MISC_CMD_INTEXT_ATRIG(1) -#define AI_AO_Select 0x09 -enum AI_AO_Select_Bits { - AI_DMA_Select_Shift = 0, - AI_DMA_Select_Mask = 0xf, - AO_DMA_Select_Shift = 4, - AO_DMA_Select_Mask = 0xf << AO_DMA_Select_Shift -}; #define G0_G1_Select 0x0b static inline unsigned ni_stc_dma_channel_select_bitfield(unsigned channel) { |