Skip to content

Commit

Permalink
staging: comedi: das08: Mark 'JR' boards in board data
Browse files Browse the repository at this point in the history
Add a bool member `is_jr` to `struct das08_board_struct` and initialize
it to `true` in those elements of `das08_boards[]` corresponding to the
'JR' board models.  This will be used by a following patch that removes
the `ai`, `ao`, `di` and `do` members from `struct das08_board_struct`.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Ian Abbott authored and Greg Kroah-Hartman committed Sep 4, 2012
1 parent ffd76b3 commit 1effe42
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 0 deletions.
3 changes: 3 additions & 0 deletions drivers/staging/comedi/drivers/das08.c
Original file line number Diff line number Diff line change
Expand Up @@ -611,6 +611,7 @@ static const struct das08_board_struct das08_boards[] = {
{
.name = "das08/jr-ao", /* cio-das08-jr-ao.pdf */
.bustype = isa,
.is_jr = true,
.ai = das08_ai_rinsn,
.ai_nbits = 12,
.ai_pg = das08_pg_none,
Expand All @@ -628,6 +629,7 @@ static const struct das08_board_struct das08_boards[] = {
{
.name = "das08jr-16-ao", /* cio-das08jr-16-ao.pdf */
.bustype = isa,
.is_jr = true,
.ai = das08_ai_rinsn,
.ai_nbits = 16,
.ai_pg = das08_pg_none,
Expand Down Expand Up @@ -670,6 +672,7 @@ static const struct das08_board_struct das08_boards[] = {
{
.name = "das08jr/16",
.bustype = isa,
.is_jr = true,
.ai = das08_ai_rinsn,
.ai_nbits = 16,
.ai_pg = das08_pg_none,
Expand Down
1 change: 1 addition & 0 deletions drivers/staging/comedi/drivers/das08.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ struct das08_board_struct {
const char *name;
unsigned int id; /* id for pci/pcmcia boards */
enum das08_bustype bustype;
bool is_jr; /* true for 'JR' boards */
void *ai;
unsigned int ai_nbits;
enum das08_lrange ai_pg;
Expand Down

0 comments on commit 1effe42

Please sign in to comment.