Browse Source

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>
Ian Abbott 13 years ago
parent
commit
1effe42da1
2 changed files with 4 additions and 0 deletions
  1. 3 0
      drivers/staging/comedi/drivers/das08.c
  2. 1 0
      drivers/staging/comedi/drivers/das08.h

+ 3 - 0
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,

+ 1 - 0
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;