提交 b8e58af6 编写于 作者: H H Hartley Sweeten 提交者: Greg Kroah-Hartman

staging: comedi: ni_tio: tidy up enum ni_660x_clock_source

These values are not used as an enum. For aesthetics, rename the
CamelCase values and convert them into defines.
Signed-off-by: NH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: NIan Abbott <abbotti@mev.co.uk>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
上级 c93a7406
...@@ -110,20 +110,17 @@ Gi_HW_Arm_Select_Mask(enum ni_gpct_variant variant) ...@@ -110,20 +110,17 @@ Gi_HW_Arm_Select_Mask(enum ni_gpct_variant variant)
} }
/* clock sources for ni_660x boards, get bits with Gi_Source_Select_Bits() */ /* clock sources for ni_660x boards, get bits with Gi_Source_Select_Bits() */
enum ni_660x_clock_source { #define NI_660X_TIMEBASE_1_CLK 0x0 /* 20MHz */
NI_660x_Timebase_1_Clock = 0x0, /* 20MHz */ #define NI_660X_SRC_PIN_I_CLK 0x1
NI_660x_Source_Pin_i_Clock = 0x1, #define NI_660X_SRC_PIN_CLK(x) (0x2 + (x))
NI_660x_Next_Gate_Clock = 0xa, #define NI_660X_NEXT_GATE_CLK 0xa
NI_660x_Timebase_2_Clock = 0x12, /* 100KHz */
NI_660x_Next_TC_Clock = 0x13,
NI_660x_Timebase_3_Clock = 0x1e, /* 80MHz */
NI_660x_Logic_Low_Clock = 0x1f,
};
#define NI_660X_MAX_RTSI_CHAN 6
#define NI_660X_RTSI_CLK(x) (0xb + (x)) #define NI_660X_RTSI_CLK(x) (0xb + (x))
#define NI_660X_TIMEBASE_2_CLK 0x12 /* 100KHz */
#define NI_660X_NEXT_TC_CLK 0x13
#define NI_660X_TIMEBASE_3_CLK 0x1e /* 80MHz */
#define NI_660X_LOGIC_LOW_CLK 0x1f
#define NI_660X_MAX_SRC_PIN 7 #define NI_660X_MAX_SRC_PIN 7
#define NI_660X_SRC_PIN_CLK(x) (0x2 + (x)) #define NI_660X_MAX_RTSI_CHAN 6
/* /*
* clock sources for ni e and m series boards, * clock sources for ni e and m series boards,
...@@ -485,25 +482,25 @@ static unsigned ni_660x_source_select_bits(unsigned int clock_source) ...@@ -485,25 +482,25 @@ static unsigned ni_660x_source_select_bits(unsigned int clock_source)
switch (clock_select_bits) { switch (clock_select_bits) {
case NI_GPCT_TIMEBASE_1_CLOCK_SRC_BITS: case NI_GPCT_TIMEBASE_1_CLOCK_SRC_BITS:
ni_660x_clock = NI_660x_Timebase_1_Clock; ni_660x_clock = NI_660X_TIMEBASE_1_CLK;
break; break;
case NI_GPCT_TIMEBASE_2_CLOCK_SRC_BITS: case NI_GPCT_TIMEBASE_2_CLOCK_SRC_BITS:
ni_660x_clock = NI_660x_Timebase_2_Clock; ni_660x_clock = NI_660X_TIMEBASE_2_CLK;
break; break;
case NI_GPCT_TIMEBASE_3_CLOCK_SRC_BITS: case NI_GPCT_TIMEBASE_3_CLOCK_SRC_BITS:
ni_660x_clock = NI_660x_Timebase_3_Clock; ni_660x_clock = NI_660X_TIMEBASE_3_CLK;
break; break;
case NI_GPCT_LOGIC_LOW_CLOCK_SRC_BITS: case NI_GPCT_LOGIC_LOW_CLOCK_SRC_BITS:
ni_660x_clock = NI_660x_Logic_Low_Clock; ni_660x_clock = NI_660X_LOGIC_LOW_CLK;
break; break;
case NI_GPCT_SOURCE_PIN_i_CLOCK_SRC_BITS: case NI_GPCT_SOURCE_PIN_i_CLOCK_SRC_BITS:
ni_660x_clock = NI_660x_Source_Pin_i_Clock; ni_660x_clock = NI_660X_SRC_PIN_I_CLK;
break; break;
case NI_GPCT_NEXT_GATE_CLOCK_SRC_BITS: case NI_GPCT_NEXT_GATE_CLOCK_SRC_BITS:
ni_660x_clock = NI_660x_Next_Gate_Clock; ni_660x_clock = NI_660X_NEXT_GATE_CLK;
break; break;
case NI_GPCT_NEXT_TC_CLOCK_SRC_BITS: case NI_GPCT_NEXT_TC_CLOCK_SRC_BITS:
ni_660x_clock = NI_660x_Next_TC_Clock; ni_660x_clock = NI_660X_NEXT_TC_CLK;
break; break;
default: default:
for (i = 0; i <= NI_660X_MAX_RTSI_CHAN; ++i) { for (i = 0; i <= NI_660X_MAX_RTSI_CHAN; ++i) {
...@@ -768,25 +765,25 @@ static unsigned ni_660x_clock_src_select(const struct ni_gpct *counter) ...@@ -768,25 +765,25 @@ static unsigned ni_660x_clock_src_select(const struct ni_gpct *counter)
unsigned i; unsigned i;
switch (input_select) { switch (input_select) {
case NI_660x_Timebase_1_Clock: case NI_660X_TIMEBASE_1_CLK:
clock_source = NI_GPCT_TIMEBASE_1_CLOCK_SRC_BITS; clock_source = NI_GPCT_TIMEBASE_1_CLOCK_SRC_BITS;
break; break;
case NI_660x_Timebase_2_Clock: case NI_660X_TIMEBASE_2_CLK:
clock_source = NI_GPCT_TIMEBASE_2_CLOCK_SRC_BITS; clock_source = NI_GPCT_TIMEBASE_2_CLOCK_SRC_BITS;
break; break;
case NI_660x_Timebase_3_Clock: case NI_660X_TIMEBASE_3_CLK:
clock_source = NI_GPCT_TIMEBASE_3_CLOCK_SRC_BITS; clock_source = NI_GPCT_TIMEBASE_3_CLOCK_SRC_BITS;
break; break;
case NI_660x_Logic_Low_Clock: case NI_660X_LOGIC_LOW_CLK:
clock_source = NI_GPCT_LOGIC_LOW_CLOCK_SRC_BITS; clock_source = NI_GPCT_LOGIC_LOW_CLOCK_SRC_BITS;
break; break;
case NI_660x_Source_Pin_i_Clock: case NI_660X_SRC_PIN_I_CLK:
clock_source = NI_GPCT_SOURCE_PIN_i_CLOCK_SRC_BITS; clock_source = NI_GPCT_SOURCE_PIN_i_CLOCK_SRC_BITS;
break; break;
case NI_660x_Next_Gate_Clock: case NI_660X_NEXT_GATE_CLK:
clock_source = NI_GPCT_NEXT_GATE_CLOCK_SRC_BITS; clock_source = NI_GPCT_NEXT_GATE_CLOCK_SRC_BITS;
break; break;
case NI_660x_Next_TC_Clock: case NI_660X_NEXT_TC_CLK:
clock_source = NI_GPCT_NEXT_TC_CLOCK_SRC_BITS; clock_source = NI_GPCT_NEXT_TC_CLOCK_SRC_BITS;
break; break;
default: default:
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册