staging: comedi: ni_tio: tidy up Gi_Command_Reg_Bits

Convert this enum into defines and rename all the CamelCase symbols.

For aesthetics, move the new defines so they are associated with the
register define.

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>

diff --git a/drivers/staging/comedi/drivers/ni_tio.c b/drivers/staging/comedi/drivers/ni_tio.c
index 1baad07fa44b30cf38f064c2e990f8da9361e65a..8df8468b46738bd057fceb5d4fd554dd2e999a00 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_tio.c
+++ b/drivers/staging/comedi/drivers/ni_tio.c
@@ -481,10 +481,8 @@ static int ni_tio_set_counter_mode(struct ni_gpct *counter, unsigned mode)
                ni_tio_set_sync_mode(counter, 0);
        }
 
-       ni_tio_set_bits(counter, NITIO_CMD_REG(cidx),
-                       Gi_Up_Down_Mask,
-                       (mode >> NI_GPCT_COUNTING_DIRECTION_SHIFT) <<
-                       Gi_Up_Down_Shift);
+       ni_tio_set_bits(counter, NITIO_CMD_REG(cidx), GI_CNT_DIR_MASK,
+                       GI_CNT_DIR(mode >> NI_GPCT_COUNTING_DIRECTION_SHIFT));
 
        if (mode & NI_GPCT_OR_GATE_BIT)
                input_select_bits |= Gi_Or_Gate_Bit;
@@ -506,10 +504,10 @@ int ni_tio_arm(struct ni_gpct *counter, int arm, unsigned start_trigger)
        if (arm) {
                switch (start_trigger) {
                case NI_GPCT_ARM_IMMEDIATE:
-                       command_transient_bits |= Gi_Arm_Bit;
+                       command_transient_bits |= GI_ARM;
                        break;
                case NI_GPCT_ARM_PAIRED_IMMEDIATE:
-                       command_transient_bits |= Gi_Arm_Bit | Gi_Arm_Copy_Bit;
+                       command_transient_bits |= GI_ARM | GI_ARM_COPY;
                        break;
                default:
                        break;
@@ -543,7 +541,7 @@ int ni_tio_arm(struct ni_gpct *counter, int arm, unsigned start_trigger)
                                        GI_HW_ARM_ENA | sel_mask, bits);
                }
        } else {
-               command_transient_bits |= Gi_Disarm_Bit;
+               command_transient_bits |= GI_DISARM;
        }
        ni_tio_set_bits_transient(counter, NITIO_CMD_REG(cidx),
                                  0, 0, command_transient_bits);
@@ -1255,9 +1253,9 @@ static unsigned int ni_tio_read_sw_save_reg(struct comedi_device *dev,
        unsigned cidx = counter->counter_index;
        unsigned int val;
 
-       ni_tio_set_bits(counter, NITIO_CMD_REG(cidx), Gi_Save_Trace_Bit, 0);
+       ni_tio_set_bits(counter, NITIO_CMD_REG(cidx), GI_SAVE_TRACE, 0);
        ni_tio_set_bits(counter, NITIO_CMD_REG(cidx),
-                       Gi_Save_Trace_Bit, Gi_Save_Trace_Bit);
+                       GI_SAVE_TRACE, GI_SAVE_TRACE);
 
        /*
         * The count doesn't get latched until the next clock edge, so it is
@@ -1341,7 +1339,7 @@ int ni_tio_insn_write(struct comedi_device *dev,
                load_reg = ni_tio_next_load_register(counter);
                write_register(counter, data[0], load_reg);
                ni_tio_set_bits_transient(counter, NITIO_CMD_REG(cidx),
-                                         0, 0, Gi_Load_Bit);
+                                         0, 0, GI_LOAD);
                /* restore load reg */
                write_register(counter, counter_dev->regs[load_reg], load_reg);
                break;
@@ -1372,7 +1370,7 @@ void ni_tio_init_counter(struct ni_gpct *counter)
        write_register(counter, 0x0, NITIO_AUTO_INC_REG(cidx));
 
        ni_tio_set_bits(counter, NITIO_CMD_REG(cidx),
-                       ~0, Gi_Synchronize_Gate_Bit);
+                       ~0, GI_SYNC_GATE);
 
        ni_tio_set_bits(counter, NITIO_MODE_REG(cidx), ~0, 0);
 

diff --git a/drivers/staging/comedi/drivers/ni_tio_internal.h b/drivers/staging/comedi/drivers/ni_tio_internal.h
index 03aa8956c29b07ce32483e2b2a63c18e2e14cffa..55f1bfc3cff85921df42823e025d1a4f0b702396 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_tio_internal.h
+++ b/drivers/staging/comedi/drivers/ni_tio_internal.h
@@ -23,6 +23,21 @@
 
 #define NITIO_AUTO_INC_REG(x)          (NITIO_G0_AUTO_INC + (x))
 #define NITIO_CMD_REG(x)               (NITIO_G0_CMD + (x))
+#define GI_ARM                         (1 << 0)
+#define GI_SAVE_TRACE                  (1 << 1)
+#define GI_LOAD                                (1 << 2)
+#define GI_DISARM                      (1 << 4)
+#define GI_CNT_DIR(x)                  (((x) & 0x3) << 5)
+#define GI_CNT_DIR_MASK                        (3 << 5)
+#define GI_WRITE_SWITCH                        (1 << 7)
+#define GI_SYNC_GATE                   (1 << 8)
+#define GI_LITTLE_BIG_ENDIAN           (1 << 9)
+#define GI_BANK_SWITCH_START           (1 << 10)
+#define GI_BANK_SWITCH_MODE            (1 << 11)
+#define GI_BANK_SWITCH_ENABLE          (1 << 12)
+#define GI_ARM_COPY                    (1 << 13)
+#define GI_SAVE_TRACE_COPY             (1 << 14)
+#define GI_DISARM_COPY                 (1 << 15)
 #define NITIO_HW_SAVE_REG(x)           (NITIO_G0_HW_SAVE + (x))
 #define NITIO_SW_SAVE_REG(x)           (NITIO_G0_SW_SAVE + (x))
 #define NITIO_MODE_REG(x)              (NITIO_G0_MODE + (x))
@@ -67,28 +82,6 @@ enum Gi_Auto_Increment_Reg_Bits {
        Gi_Auto_Increment_Mask = 0xff
 };
 
-#define Gi_Up_Down_Shift 5
-enum Gi_Command_Reg_Bits {
-       Gi_Arm_Bit = 0x1,
-       Gi_Save_Trace_Bit = 0x2,
-       Gi_Load_Bit = 0x4,
-       Gi_Disarm_Bit = 0x10,
-       Gi_Up_Down_Mask = 0x3 << Gi_Up_Down_Shift,
-       Gi_Always_Down_Bits = 0x0 << Gi_Up_Down_Shift,
-       Gi_Always_Up_Bits = 0x1 << Gi_Up_Down_Shift,
-       Gi_Up_Down_Hardware_IO_Bits = 0x2 << Gi_Up_Down_Shift,
-       Gi_Up_Down_Hardware_Gate_Bits = 0x3 << Gi_Up_Down_Shift,
-       Gi_Write_Switch_Bit = 0x80,
-       Gi_Synchronize_Gate_Bit = 0x100,
-       Gi_Little_Big_Endian_Bit = 0x200,
-       Gi_Bank_Switch_Start_Bit = 0x400,
-       Gi_Bank_Switch_Mode_Bit = 0x800,
-       Gi_Bank_Switch_Enable_Bit = 0x1000,
-       Gi_Arm_Copy_Bit = 0x2000,
-       Gi_Save_Trace_Copy_Bit = 0x4000,
-       Gi_Disarm_Copy_Bit = 0x8000
-};
-
 #define Gi_Source_Select_Shift 2
 #define Gi_Gate_Select_Shift 7
 enum Gi_Input_Select_Bits {

diff --git a/drivers/staging/comedi/drivers/ni_tiocmd.c b/drivers/staging/comedi/drivers/ni_tiocmd.c
index f66b504811bf3fcec3be7a7be347f32cba0dfde4..8ea0debd58d42b2da6df32f17ec82aa50c9dc06b 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_tiocmd.c
+++ b/drivers/staging/comedi/drivers/ni_tiocmd.c
@@ -139,7 +139,7 @@ static int ni_tio_input_cmd(struct comedi_subdevice *s)
                BUG();
                break;
        }
-       ni_tio_set_bits(counter, NITIO_CMD_REG(cidx), Gi_Save_Trace_Bit, 0);
+       ni_tio_set_bits(counter, NITIO_CMD_REG(cidx), GI_SAVE_TRACE, 0);
        ni_tio_configure_dma(counter, 1, 1);
        switch (cmd->start_src) {
        case TRIG_NOW: