Rename the CamelCase and define the G0 and G1 registers to add clarity
to the mio_regmap tables.
Signed-off-by: H Hartley Sweeten <hswee...@visionengravers.com>
Cc: Ian Abbott <abbo...@mev.co.uk>
Cc: Greg Kroah-Hartman <gre...@linuxfoundation.org>
---
drivers/staging/comedi/drivers/ni_mio_common.c | 8 ++++----
drivers/staging/comedi/drivers/ni_stc.h | 6 +++---
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/comedi/drivers/ni_mio_common.c
b/drivers/staging/comedi/drivers/ni_mio_common.c
index ea30689..f0f449c 100644
--- a/drivers/staging/comedi/drivers/ni_mio_common.c
+++ b/drivers/staging/comedi/drivers/ni_mio_common.c
@@ -416,8 +416,8 @@ static const struct mio_regmap m_series_stc_read_regmap[] =
{
[NISTC_AI_STATUS2_REG] = { 0, 0 }, /* Unknown */
[NISTC_AO_STATUS2_REG] = { 0x10c, 2 },
[NISTC_DIO_IN_REG] = { 0, 0 }, /* Unknown */
- [G_HW_Save_Register(0)] = { 0x110, 4 },
- [G_HW_Save_Register(1)] = { 0x114, 4 },
+ [NISTC_G0_HW_SAVE_REG] = { 0x110, 4 },
+ [NISTC_G1_HW_SAVE_REG] = { 0x114, 4 },
[G_Save_Register(0)] = { 0x118, 4 },
[G_Save_Register(1)] = { 0x11c, 4 },
[AO_UI_Save_Registers] = { 0x120, 4 },
@@ -3706,8 +3706,8 @@ static const struct mio_regmap ni_gpct_to_stc_regmap[] = {
[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 },
- [NITIO_G1_HW_SAVE] = { G_HW_Save_Register(1), 4 },
+ [NITIO_G0_HW_SAVE] = { NISTC_G0_HW_SAVE_REG, 4 },
+ [NITIO_G1_HW_SAVE] = { NISTC_G1_HW_SAVE_REG, 4 },
[NITIO_G0_SW_SAVE] = { G_Save_Register(0), 4 },
[NITIO_G1_SW_SAVE] = { G_Save_Register(1), 4 },
[NITIO_G0_MODE] = { NISTC_G0_MODE_REG, 2 },
diff --git a/drivers/staging/comedi/drivers/ni_stc.h
b/drivers/staging/comedi/drivers/ni_stc.h
index 5be6a950..0b4dcc4 100644
--- a/drivers/staging/comedi/drivers/ni_stc.h
+++ b/drivers/staging/comedi/drivers/ni_stc.h
@@ -540,6 +540,9 @@
#define NISTC_DIO_IN_REG 7
+#define NISTC_G0_HW_SAVE_REG 8
+#define NISTC_G1_HW_SAVE_REG 10
+
#define AI_SI_Save_Registers 64
#define AI_SC_Save_Registers 66
@@ -556,9 +559,6 @@ enum Joint_Status_2_Bits {
#define AO_BC_Save_Registers 18
#define AO_UC_Save_Registers 20
-#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)
#define G_Save_Register(a) (12+(a)*2)
#define G_Save_Register_High(a) (12+(a)*2)
#define G_Save_Register_Low(a) (13+(a)*2)
--
2.3.0
_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
