Commit 1b3e0c80 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: ni_labpc: tidy up range table declarations

Tidy up all the tables used to indicate the bipolar/unipolar
type of the range. the gain bits used to set the range, and the
comedi_lrange.

Remove a couple unnecessary #define's used to indicate the size
of the tables as well as some unnecessary comments.
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 74df5760
...@@ -215,51 +215,18 @@ enum scan_mode { ...@@ -215,51 +215,18 @@ enum scan_mode {
MODE_MULT_CHAN_DOWN, MODE_MULT_CHAN_DOWN,
}; };
/* analog input ranges */ static const int labpc_plus_is_unipolar[] = {
#define NUM_LABPC_PLUS_AI_RANGES 16 0, 0, 0, 0, 0, 0, 0, 0,
/* indicates unipolar ranges */ 1, 1, 1, 1, 1, 1, 1, 1,
static const int labpc_plus_is_unipolar[NUM_LABPC_PLUS_AI_RANGES] = {
0,
0,
0,
0,
0,
0,
0,
0,
1,
1,
1,
1,
1,
1,
1,
1,
}; };
/* map range index to gain bits */ static const int labpc_plus_ai_gain_bits[] = {
static const int labpc_plus_ai_gain_bits[NUM_LABPC_PLUS_AI_RANGES] = { 0x00, 0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x70,
0x00, 0x00, 0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x70,
0x10,
0x20,
0x30,
0x40,
0x50,
0x60,
0x70,
0x00,
0x10,
0x20,
0x30,
0x40,
0x50,
0x60,
0x70,
}; };
static const struct comedi_lrange range_labpc_plus_ai = { static const struct comedi_lrange range_labpc_plus_ai = {
NUM_LABPC_PLUS_AI_RANGES, 16, {
{
BIP_RANGE(5), BIP_RANGE(5),
BIP_RANGE(4), BIP_RANGE(4),
BIP_RANGE(2.5), BIP_RANGE(2.5),
...@@ -275,52 +242,24 @@ static const struct comedi_lrange range_labpc_plus_ai = { ...@@ -275,52 +242,24 @@ static const struct comedi_lrange range_labpc_plus_ai = {
UNI_RANGE(1), UNI_RANGE(1),
UNI_RANGE(0.5), UNI_RANGE(0.5),
UNI_RANGE(0.2), UNI_RANGE(0.2),
UNI_RANGE(0.1), UNI_RANGE(0.1)
} }
}; };
#define NUM_LABPC_1200_AI_RANGES 14 const int labpc_1200_is_unipolar[] = {
/* indicates unipolar ranges */ 0, 0, 0, 0, 0, 0, 0,
const int labpc_1200_is_unipolar[NUM_LABPC_1200_AI_RANGES] = { 1, 1, 1, 1, 1, 1, 1,
0,
0,
0,
0,
0,
0,
0,
1,
1,
1,
1,
1,
1,
1,
}; };
EXPORT_SYMBOL_GPL(labpc_1200_is_unipolar); EXPORT_SYMBOL_GPL(labpc_1200_is_unipolar);
/* map range index to gain bits */ const int labpc_1200_ai_gain_bits[] = {
const int labpc_1200_ai_gain_bits[NUM_LABPC_1200_AI_RANGES] = { 0x00, 0x20, 0x30, 0x40, 0x50, 0x60, 0x70,
0x00, 0x00, 0x20, 0x30, 0x40, 0x50, 0x60, 0x70,
0x20,
0x30,
0x40,
0x50,
0x60,
0x70,
0x00,
0x20,
0x30,
0x40,
0x50,
0x60,
0x70,
}; };
EXPORT_SYMBOL_GPL(labpc_1200_ai_gain_bits); EXPORT_SYMBOL_GPL(labpc_1200_ai_gain_bits);
const struct comedi_lrange range_labpc_1200_ai = { const struct comedi_lrange range_labpc_1200_ai = {
NUM_LABPC_1200_AI_RANGES, 14, {
{
BIP_RANGE(5), BIP_RANGE(5),
BIP_RANGE(2.5), BIP_RANGE(2.5),
BIP_RANGE(1), BIP_RANGE(1),
...@@ -334,18 +273,16 @@ const struct comedi_lrange range_labpc_1200_ai = { ...@@ -334,18 +273,16 @@ const struct comedi_lrange range_labpc_1200_ai = {
UNI_RANGE(1), UNI_RANGE(1),
UNI_RANGE(0.5), UNI_RANGE(0.5),
UNI_RANGE(0.2), UNI_RANGE(0.2),
UNI_RANGE(0.1), UNI_RANGE(0.1)
} }
}; };
EXPORT_SYMBOL_GPL(range_labpc_1200_ai); EXPORT_SYMBOL_GPL(range_labpc_1200_ai);
/* analog output ranges */
#define AO_RANGE_IS_UNIPOLAR 0x1 #define AO_RANGE_IS_UNIPOLAR 0x1
static const struct comedi_lrange range_labpc_ao = { static const struct comedi_lrange range_labpc_ao = {
2, 2, {
{
BIP_RANGE(5), BIP_RANGE(5),
UNI_RANGE(10), UNI_RANGE(10)
} }
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment