diff options
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_mio_common.c | 8 | ||||
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_stc.h | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/drivers/staging/comedi/drivers/ni_mio_common.c b/drivers/staging/comedi/drivers/ni_mio_common.c index 0634babd2cf2..2c85b5715b05 100644 --- a/drivers/staging/comedi/drivers/ni_mio_common.c +++ b/drivers/staging/comedi/drivers/ni_mio_common.c @@ -362,8 +362,8 @@ static const struct mio_regmap m_series_stc_write_regmap[] = { [NISTC_AI_DIV_LOADA_REG] = { 0x180, 4 }, [NISTC_AO_START_SEL_REG] = { 0x184, 2 }, [NISTC_AO_TRIG_SEL_REG] = { 0x186, 2 }, - [G_Autoincrement_Register(0)] = { 0x188, 2 }, - [G_Autoincrement_Register(1)] = { 0x18a, 2 }, + [NISTC_G0_AUTOINC_REG] = { 0x188, 2 }, + [NISTC_G1_AUTOINC_REG] = { 0x18a, 2 }, [AO_Mode_3_Register] = { 0x18c, 2 }, [Joint_Reset_Register] = { 0x190, 2 }, [Interrupt_A_Enable_Register] = { 0x192, 2 }, @@ -3712,8 +3712,8 @@ static void init_ao_67xx(struct comedi_device *dev, struct comedi_subdevice *s) } static const struct mio_regmap ni_gpct_to_stc_regmap[] = { - [NITIO_G0_AUTO_INC] = { G_Autoincrement_Register(0), 2 }, - [NITIO_G1_AUTO_INC] = { G_Autoincrement_Register(1), 2 }, + [NITIO_G0_AUTO_INC] = { NISTC_G0_AUTOINC_REG, 2 }, + [NITIO_G1_AUTO_INC] = { NISTC_G1_AUTOINC_REG, 2 }, [NITIO_G0_CMD] = { NISTC_G0_CMD_REG, 2 }, [NITIO_G1_CMD] = { NISTC_G1_CMD_REG, 2 }, [NITIO_G0_HW_SAVE] = { G_HW_Save_Register(0), 4 }, diff --git a/drivers/staging/comedi/drivers/ni_stc.h b/drivers/staging/comedi/drivers/ni_stc.h index 385950430627..f63f290c4cb1 100644 --- a/drivers/staging/comedi/drivers/ni_stc.h +++ b/drivers/staging/comedi/drivers/ni_stc.h @@ -359,6 +359,9 @@ #define NISTC_AO_TRIG_START1_SEL(x) (((x) & 0x1f) << 0) #define NISTC_AO_TRIG_START1_SEL_MASK NISTC_AO_TRIG_START1_SEL(0x1f) +#define NISTC_G0_AUTOINC_REG 68 +#define NISTC_G1_AUTOINC_REG 69 + #define AI_Status_1_Register 2 #define Interrupt_A_St 0x8000 #define AI_FIFO_Full_St 0x4000 @@ -589,7 +592,6 @@ static unsigned AO_UPDATE_Output_Select(enum ao_update_output_selection #define AI_External_Gate_Polarity _bit5 #define AI_External_Gate_Select(a) ((a) & 0x1f) -#define G_Autoincrement_Register(a) (68+(a)) #define G_HW_Save_Register(a) (8+(a)*2) #define G_HW_Save_Register_High(a) (8+(a)*2) #define G_HW_Save_Register_Low(a) (9+(a)*2) |