From 1effe42da1ee4b424ccd2f8abaea5f838ef6ac93 Mon Sep 17 00:00:00 2001 From: Ian Abbott Date: Fri, 31 Aug 2012 20:41:33 +0100 Subject: [PATCH] staging: comedi: das08: Mark 'JR' boards in board data 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 Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/drivers/das08.c | 3 +++ drivers/staging/comedi/drivers/das08.h | 1 + 2 files changed, 4 insertions(+) diff --git a/drivers/staging/comedi/drivers/das08.c b/drivers/staging/comedi/drivers/das08.c index d176b3b..e17a71e 100644 --- a/drivers/staging/comedi/drivers/das08.c +++ b/drivers/staging/comedi/drivers/das08.c @@ -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, @@ -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, @@ -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, diff --git a/drivers/staging/comedi/drivers/das08.h b/drivers/staging/comedi/drivers/das08.h index 320f56a..5e00530 100644 --- a/drivers/staging/comedi/drivers/das08.h +++ b/drivers/staging/comedi/drivers/das08.h @@ -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; -- 2.7.4