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

staging: comedi: me4000: refactor 'ai_sh_nchan' boardinfo

Some of the boards supported by this driver can do analog input sample &
hold on 8 of the channels. The 'ai_sh_nchan' member of the boardinfo is
used to indicate which boards support this feature. To save a bit of space,
convert this member to a bit-field, 'can_do_sh_ai'. Note, this feature is
not currently supported.
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 77714d31
...@@ -189,8 +189,8 @@ enum me4000_boardid { ...@@ -189,8 +189,8 @@ enum me4000_boardid {
struct me4000_board { struct me4000_board {
const char *name; const char *name;
int ai_nchan; int ai_nchan;
int ai_sh_nchan;
unsigned int can_do_diff_ai:1; unsigned int can_do_diff_ai:1;
unsigned int can_do_sh_ai:1; /* sample & hold (8 channels) */
unsigned int ex_trig_analog:1; unsigned int ex_trig_analog:1;
unsigned int has_ao:1; unsigned int has_ao:1;
unsigned int has_ao_fifo:1; unsigned int has_ao_fifo:1;
...@@ -217,15 +217,15 @@ static const struct me4000_board me4000_boards[] = { ...@@ -217,15 +217,15 @@ static const struct me4000_board me4000_boards[] = {
[BOARD_ME4660S] = { [BOARD_ME4660S] = {
.name = "ME-4660s", .name = "ME-4660s",
.ai_nchan = 32, .ai_nchan = 32,
.ai_sh_nchan = 8,
.can_do_diff_ai = 1, .can_do_diff_ai = 1,
.can_do_sh_ai = 1,
.has_counter = 1, .has_counter = 1,
}, },
[BOARD_ME4660IS] = { [BOARD_ME4660IS] = {
.name = "ME-4660is", .name = "ME-4660is",
.ai_nchan = 32, .ai_nchan = 32,
.ai_sh_nchan = 8,
.can_do_diff_ai = 1, .can_do_diff_ai = 1,
.can_do_sh_ai = 1,
.has_counter = 1, .has_counter = 1,
}, },
[BOARD_ME4670] = { [BOARD_ME4670] = {
...@@ -247,8 +247,8 @@ static const struct me4000_board me4000_boards[] = { ...@@ -247,8 +247,8 @@ static const struct me4000_board me4000_boards[] = {
[BOARD_ME4670S] = { [BOARD_ME4670S] = {
.name = "ME-4670s", .name = "ME-4670s",
.ai_nchan = 32, .ai_nchan = 32,
.ai_sh_nchan = 8,
.can_do_diff_ai = 1, .can_do_diff_ai = 1,
.can_do_sh_ai = 1,
.ex_trig_analog = 1, .ex_trig_analog = 1,
.has_ao = 1, .has_ao = 1,
.has_counter = 1, .has_counter = 1,
...@@ -256,8 +256,8 @@ static const struct me4000_board me4000_boards[] = { ...@@ -256,8 +256,8 @@ static const struct me4000_board me4000_boards[] = {
[BOARD_ME4670IS] = { [BOARD_ME4670IS] = {
.name = "ME-4670is", .name = "ME-4670is",
.ai_nchan = 32, .ai_nchan = 32,
.ai_sh_nchan = 8,
.can_do_diff_ai = 1, .can_do_diff_ai = 1,
.can_do_sh_ai = 1,
.ex_trig_analog = 1, .ex_trig_analog = 1,
.has_ao = 1, .has_ao = 1,
.has_counter = 1, .has_counter = 1,
...@@ -283,8 +283,8 @@ static const struct me4000_board me4000_boards[] = { ...@@ -283,8 +283,8 @@ static const struct me4000_board me4000_boards[] = {
[BOARD_ME4680S] = { [BOARD_ME4680S] = {
.name = "ME-4680s", .name = "ME-4680s",
.ai_nchan = 32, .ai_nchan = 32,
.ai_sh_nchan = 8,
.can_do_diff_ai = 1, .can_do_diff_ai = 1,
.can_do_sh_ai = 1,
.ex_trig_analog = 1, .ex_trig_analog = 1,
.has_ao = 1, .has_ao = 1,
.has_ao_fifo = 1, .has_ao_fifo = 1,
...@@ -293,8 +293,8 @@ static const struct me4000_board me4000_boards[] = { ...@@ -293,8 +293,8 @@ static const struct me4000_board me4000_boards[] = {
[BOARD_ME4680IS] = { [BOARD_ME4680IS] = {
.name = "ME-4680is", .name = "ME-4680is",
.ai_nchan = 32, .ai_nchan = 32,
.ai_sh_nchan = 8,
.can_do_diff_ai = 1, .can_do_diff_ai = 1,
.can_do_sh_ai = 1,
.ex_trig_analog = 1, .ex_trig_analog = 1,
.has_ao = 1, .has_ao = 1,
.has_ao_fifo = 1, .has_ao_fifo = 1,
......
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