diff options
| author |   H Hartley Sweeten <hsweeten@visionengravers.com> | 2015-05-01 15:00:07 -0700 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-05-09 19:05:18 +0200 |
| commit | 0418da51378e83cde58043cf7a272760a5214a2d (patch) | |
| tree | d522c8589fb65387d2f4c1f6f1ece149d134a984 /drivers/staging/comedi/drivers/ni_stc.h | |
| parent | staging: comedi: ni_stc.h: remove unused _bit* defines (diff) | |
| download | linux-dev-0418da51378e83cde58043cf7a272760a5214a2d.tar.xz linux-dev-0418da51378e83cde58043cf7a272760a5214a2d.zip | |
staging: comedi: ni_stc.h: rename the NI-611x register defines
Rename the CamelCase.
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 | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/drivers/staging/comedi/drivers/ni_stc.h b/drivers/staging/comedi/drivers/ni_stc.h index 4f4a902baf01..578c839f2bf8 100644 --- a/drivers/staging/comedi/drivers/ni_stc.h +++ b/drivers/staging/comedi/drivers/ni_stc.h @@ -605,17 +605,18 @@ #define NI_E_AO_FIFO_DATA_REG 0x1e /* w16 */ -/* 611x registers (these boards differ from the e-series) */ - -#define Magic_611x 0x19 /* w8 (new) */ -#define Calibration_Channel_Select_611x 0x1a /* w16 (new) */ -#define ADC_FIFO_Data_611x 0x1c /* r32 (incompatible) */ -#define AI_FIFO_Offset_Load_611x 0x05 /* r8 (new) */ -#define DAC_FIFO_Data_611x 0x14 /* w32 (incompatible) */ -#define Cal_Gain_Select_611x 0x05 /* w8 (new) */ - -#define AO_Window_Address_611x 0x18 -#define AO_Window_Data_611x 0x1e +/* + * 611x registers (these boards differ from the e-series) + */ +#define NI611X_MAGIC_REG 0x19 /* w8 (new) */ +#define NI611X_CALIB_CHAN_SEL_REG 0x1a /* w16 (new) */ +#define NI611X_AI_FIFO_DATA_REG 0x1c /* r32 (incompatible) */ +#define NI611X_AI_FIFO_OFFSET_LOAD_REG 0x05 /* r8 (new) */ +#define NI611X_AO_FIFO_DATA_REG 0x14 /* w32 (incompatible) */ +#define NI611X_CAL_GAIN_SEL_REG 0x05 /* w8 (new) */ + +#define NI611X_AO_WINDOW_ADDR_REG 0x18 +#define NI611X_AO_WINDOW_DATA_REG 0x1e /* 6143 registers */ #define Magic_6143 0x19 /* w8 */ |