summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Abbott <abbotti@mev.co.uk>2012-08-31 20:41:33 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-09-04 12:00:41 -0700
commit1effe42da1ee4b424ccd2f8abaea5f838ef6ac93 (patch)
tree8b4d7d6a7f8acc22409bf3a67ba3f3e2a2da117d
parentffd76b327a19b49696635cd6891b9d279a73623e (diff)
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 <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/comedi/drivers/das08.c3
-rw-r--r--drivers/staging/comedi/drivers/das08.h1
2 files changed, 4 insertions, 0 deletions
diff --git a/drivers/staging/comedi/drivers/das08.c b/drivers/staging/comedi/drivers/das08.c
index d176b3bd551c..e17a71e0e864 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 320f56aa3148..5e005302161b 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;