Skip to content

L
linux
Commit 0ed9f25f authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files
Options

staging: comedi: addi_apci_3xxx: refactor 'i_NbrTTLChannel' boardinfo 

The boards that have ttl input and output channels always have 24
channels.

Remove the 'i_NbrTTLChannel' data from the boardinfo and add a bit
field to indicate that the board 'has_ttl_io'. Use that to conditionally
initialize the subdevice and open code the s->n_chan value of 24.
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 4aab8bfd
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 25 deletions
drivers/staging/comedi/drivers/addi_apci_3xxx.c
View file @ 0ed9f25f
...@@ -84,11 +84,11 @@ struct apci3xxx_boardinfo { ...@@ -84,11 +84,11 @@ struct apci3xxx_boardinfo {
int i_NbrAoChannel; int i_NbrAoChannel;
int i_AiMaxdata; int i_AiMaxdata;
int i_AoMaxdata; int i_AoMaxdata;
int i_NbrTTLChannel;
unsigned char b_AvailableConvertUnit; unsigned char b_AvailableConvertUnit;
unsigned int ui_MinAcquisitiontimeNs; unsigned int ui_MinAcquisitiontimeNs;
unsigned int has_dig_in:1; unsigned int has_dig_in:1;
unsigned int has_dig_out:1; unsigned int has_dig_out:1;
unsigned int has_ttl_io:1;
}; };
static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = { static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
...@@ -98,9 +98,9 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = { ...@@ -98,9 +98,9 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
.i_NbrAiChannelDiff = 8, .i_NbrAiChannelDiff = 8,
.i_AiChannelList = 16, .i_AiChannelList = 16,
.i_AiMaxdata = 4095, .i_AiMaxdata = 4095,
.i_NbrTTLChannel = 24,
.b_AvailableConvertUnit = 6, .b_AvailableConvertUnit = 6,
.ui_MinAcquisitiontimeNs = 10000, .ui_MinAcquisitiontimeNs = 10000,
.has_ttl_io = 1,
}, },
[BOARD_APCI3000_8] = { [BOARD_APCI3000_8] = {
.pc_DriverName = "apci3000-8", .pc_DriverName = "apci3000-8",
...@@ -108,9 +108,9 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = { ...@@ -108,9 +108,9 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
.i_NbrAiChannelDiff = 4, .i_NbrAiChannelDiff = 4,
.i_AiChannelList = 8, .i_AiChannelList = 8,
.i_AiMaxdata = 4095, .i_AiMaxdata = 4095,
.i_NbrTTLChannel = 24,
.b_AvailableConvertUnit = 6, .b_AvailableConvertUnit = 6,
.ui_MinAcquisitiontimeNs = 10000, .ui_MinAcquisitiontimeNs = 10000,
.has_ttl_io = 1,
}, },
[BOARD_APCI3000_4] = { [BOARD_APCI3000_4] = {
.pc_DriverName = "apci3000-4", .pc_DriverName = "apci3000-4",
...@@ -118,9 +118,9 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = { ...@@ -118,9 +118,9 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
.i_NbrAiChannelDiff = 2, .i_NbrAiChannelDiff = 2,
.i_AiChannelList = 4, .i_AiChannelList = 4,
.i_AiMaxdata = 4095, .i_AiMaxdata = 4095,
.i_NbrTTLChannel = 24,
.b_AvailableConvertUnit = 6, .b_AvailableConvertUnit = 6,
.ui_MinAcquisitiontimeNs = 10000, .ui_MinAcquisitiontimeNs = 10000,
.has_ttl_io = 1,
}, },
[BOARD_APCI3006_16] = { [BOARD_APCI3006_16] = {
.pc_DriverName = "apci3006-16", .pc_DriverName = "apci3006-16",
...@@ -128,9 +128,9 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = { ...@@ -128,9 +128,9 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
.i_NbrAiChannelDiff = 8, .i_NbrAiChannelDiff = 8,
.i_AiChannelList = 16, .i_AiChannelList = 16,
.i_AiMaxdata = 65535, .i_AiMaxdata = 65535,
.i_NbrTTLChannel = 24,
.b_AvailableConvertUnit = 6, .b_AvailableConvertUnit = 6,
.ui_MinAcquisitiontimeNs = 10000, .ui_MinAcquisitiontimeNs = 10000,
.has_ttl_io = 1,
}, },
[BOARD_APCI3006_8] = { [BOARD_APCI3006_8] = {
.pc_DriverName = "apci3006-8", .pc_DriverName = "apci3006-8",
...@@ -138,9 +138,9 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = { ...@@ -138,9 +138,9 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
.i_NbrAiChannelDiff = 4, .i_NbrAiChannelDiff = 4,
.i_AiChannelList = 8, .i_AiChannelList = 8,
.i_AiMaxdata = 65535, .i_AiMaxdata = 65535,
.i_NbrTTLChannel = 24,
.b_AvailableConvertUnit = 6, .b_AvailableConvertUnit = 6,
.ui_MinAcquisitiontimeNs = 10000, .ui_MinAcquisitiontimeNs = 10000,
.has_ttl_io = 1,
}, },
[BOARD_APCI3006_4] = { [BOARD_APCI3006_4] = {
.pc_DriverName = "apci3006-4", .pc_DriverName = "apci3006-4",
...@@ -148,9 +148,9 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = { ...@@ -148,9 +148,9 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
.i_NbrAiChannelDiff = 2, .i_NbrAiChannelDiff = 2,
.i_AiChannelList = 4, .i_AiChannelList = 4,
.i_AiMaxdata = 65535, .i_AiMaxdata = 65535,
.i_NbrTTLChannel = 24,
.b_AvailableConvertUnit = 6, .b_AvailableConvertUnit = 6,
.ui_MinAcquisitiontimeNs = 10000, .ui_MinAcquisitiontimeNs = 10000,
.has_ttl_io = 1,
}, },
[BOARD_APCI3010_16] = { [BOARD_APCI3010_16] = {
.pc_DriverName = "apci3010-16", .pc_DriverName = "apci3010-16",
...@@ -158,11 +158,11 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = { ...@@ -158,11 +158,11 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
.i_NbrAiChannelDiff = 8, .i_NbrAiChannelDiff = 8,
.i_AiChannelList = 16, .i_AiChannelList = 16,
.i_AiMaxdata = 4095, .i_AiMaxdata = 4095,
.i_NbrTTLChannel = 24,
.b_AvailableConvertUnit = 6, .b_AvailableConvertUnit = 6,
.ui_MinAcquisitiontimeNs = 5000, .ui_MinAcquisitiontimeNs = 5000,
.has_dig_in = 1, .has_dig_in = 1,
.has_dig_out = 1, .has_dig_out = 1,
.has_ttl_io = 1,
}, },
[BOARD_APCI3010_8] = { [BOARD_APCI3010_8] = {
.pc_DriverName = "apci3010-8", .pc_DriverName = "apci3010-8",
...@@ -170,11 +170,11 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = { ...@@ -170,11 +170,11 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
.i_NbrAiChannelDiff = 4, .i_NbrAiChannelDiff = 4,
.i_AiChannelList = 8, .i_AiChannelList = 8,
.i_AiMaxdata = 4095, .i_AiMaxdata = 4095,
.i_NbrTTLChannel = 24,
.b_AvailableConvertUnit = 6, .b_AvailableConvertUnit = 6,
.ui_MinAcquisitiontimeNs = 5000, .ui_MinAcquisitiontimeNs = 5000,
.has_dig_in = 1, .has_dig_in = 1,
.has_dig_out = 1, .has_dig_out = 1,
.has_ttl_io = 1,
}, },
[BOARD_APCI3010_4] = { [BOARD_APCI3010_4] = {
.pc_DriverName = "apci3010-4", .pc_DriverName = "apci3010-4",
...@@ -182,11 +182,11 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = { ...@@ -182,11 +182,11 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
.i_NbrAiChannelDiff = 2, .i_NbrAiChannelDiff = 2,
.i_AiChannelList = 4, .i_AiChannelList = 4,
.i_AiMaxdata = 4095, .i_AiMaxdata = 4095,
.i_NbrTTLChannel = 24,
.b_AvailableConvertUnit = 6, .b_AvailableConvertUnit = 6,
.ui_MinAcquisitiontimeNs = 5000, .ui_MinAcquisitiontimeNs = 5000,
.has_dig_in = 1, .has_dig_in = 1,
.has_dig_out = 1, .has_dig_out = 1,
.has_ttl_io = 1,
}, },
[BOARD_APCI3016_16] = { [BOARD_APCI3016_16] = {
.pc_DriverName = "apci3016-16", .pc_DriverName = "apci3016-16",
...@@ -194,11 +194,11 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = { ...@@ -194,11 +194,11 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
.i_NbrAiChannelDiff = 8, .i_NbrAiChannelDiff = 8,
.i_AiChannelList = 16, .i_AiChannelList = 16,
.i_AiMaxdata = 65535, .i_AiMaxdata = 65535,
.i_NbrTTLChannel = 24,
.b_AvailableConvertUnit = 6, .b_AvailableConvertUnit = 6,
.ui_MinAcquisitiontimeNs = 5000, .ui_MinAcquisitiontimeNs = 5000,
.has_dig_in = 1, .has_dig_in = 1,
.has_dig_out = 1, .has_dig_out = 1,
.has_ttl_io = 1,
}, },
[BOARD_APCI3016_8] = { [BOARD_APCI3016_8] = {
.pc_DriverName = "apci3016-8", .pc_DriverName = "apci3016-8",
...@@ -206,11 +206,11 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = { ...@@ -206,11 +206,11 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
.i_NbrAiChannelDiff = 4, .i_NbrAiChannelDiff = 4,
.i_AiChannelList = 8, .i_AiChannelList = 8,
.i_AiMaxdata = 65535, .i_AiMaxdata = 65535,
.i_NbrTTLChannel = 24,
.b_AvailableConvertUnit = 6, .b_AvailableConvertUnit = 6,
.ui_MinAcquisitiontimeNs = 5000, .ui_MinAcquisitiontimeNs = 5000,
.has_dig_in = 1, .has_dig_in = 1,
.has_dig_out = 1, .has_dig_out = 1,
.has_ttl_io = 1,
}, },
[BOARD_APCI3016_4] = { [BOARD_APCI3016_4] = {
.pc_DriverName = "apci3016-4", .pc_DriverName = "apci3016-4",
...@@ -218,11 +218,11 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = { ...@@ -218,11 +218,11 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
.i_NbrAiChannelDiff = 2, .i_NbrAiChannelDiff = 2,
.i_AiChannelList = 4, .i_AiChannelList = 4,
.i_AiMaxdata = 65535, .i_AiMaxdata = 65535,
.i_NbrTTLChannel = 24,
.b_AvailableConvertUnit = 6, .b_AvailableConvertUnit = 6,
.ui_MinAcquisitiontimeNs = 5000, .ui_MinAcquisitiontimeNs = 5000,
.has_dig_in = 1, .has_dig_in = 1,
.has_dig_out = 1, .has_dig_out = 1,
.has_ttl_io = 1,
}, },
[BOARD_APCI3100_16_4] = { [BOARD_APCI3100_16_4] = {
.pc_DriverName = "apci3100-16-4", .pc_DriverName = "apci3100-16-4",
...@@ -232,9 +232,9 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = { ...@@ -232,9 +232,9 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
.i_NbrAoChannel = 4, .i_NbrAoChannel = 4,
.i_AiMaxdata = 4095, .i_AiMaxdata = 4095,
.i_AoMaxdata = 4095, .i_AoMaxdata = 4095,
.i_NbrTTLChannel = 24,
.b_AvailableConvertUnit = 6, .b_AvailableConvertUnit = 6,
.ui_MinAcquisitiontimeNs = 10000, .ui_MinAcquisitiontimeNs = 10000,
.has_ttl_io = 1,
}, },
[BOARD_APCI3100_8_4] = { [BOARD_APCI3100_8_4] = {
.pc_DriverName = "apci3100-8-4", .pc_DriverName = "apci3100-8-4",
...@@ -244,9 +244,9 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = { ...@@ -244,9 +244,9 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
.i_NbrAoChannel = 4, .i_NbrAoChannel = 4,
.i_AiMaxdata = 4095, .i_AiMaxdata = 4095,
.i_AoMaxdata = 4095, .i_AoMaxdata = 4095,
.i_NbrTTLChannel = 24,
.b_AvailableConvertUnit = 6, .b_AvailableConvertUnit = 6,
.ui_MinAcquisitiontimeNs = 10000, .ui_MinAcquisitiontimeNs = 10000,
.has_ttl_io = 1,
}, },
[BOARD_APCI3106_16_4] = { [BOARD_APCI3106_16_4] = {
.pc_DriverName = "apci3106-16-4", .pc_DriverName = "apci3106-16-4",
...@@ -256,9 +256,9 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = { ...@@ -256,9 +256,9 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
.i_NbrAoChannel = 4, .i_NbrAoChannel = 4,
.i_AiMaxdata = 65535, .i_AiMaxdata = 65535,
.i_AoMaxdata = 4095, .i_AoMaxdata = 4095,
.i_NbrTTLChannel = 24,
.b_AvailableConvertUnit = 6, .b_AvailableConvertUnit = 6,
.ui_MinAcquisitiontimeNs = 10000, .ui_MinAcquisitiontimeNs = 10000,
.has_ttl_io = 1,
}, },
[BOARD_APCI3106_8_4] = { [BOARD_APCI3106_8_4] = {
.pc_DriverName = "apci3106-8-4", .pc_DriverName = "apci3106-8-4",
...@@ -268,9 +268,9 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = { ...@@ -268,9 +268,9 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
.i_NbrAoChannel = 4, .i_NbrAoChannel = 4,
.i_AiMaxdata = 65535, .i_AiMaxdata = 65535,
.i_AoMaxdata = 4095, .i_AoMaxdata = 4095,
.i_NbrTTLChannel = 24,
.b_AvailableConvertUnit = 6, .b_AvailableConvertUnit = 6,
.ui_MinAcquisitiontimeNs = 10000, .ui_MinAcquisitiontimeNs = 10000,
.has_ttl_io = 1,
}, },
[BOARD_APCI3110_16_4] = { [BOARD_APCI3110_16_4] = {
.pc_DriverName = "apci3110-16-4", .pc_DriverName = "apci3110-16-4",
...@@ -280,11 +280,11 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = { ...@@ -280,11 +280,11 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
.i_NbrAoChannel = 4, .i_NbrAoChannel = 4,
.i_AiMaxdata = 4095, .i_AiMaxdata = 4095,
.i_AoMaxdata = 4095, .i_AoMaxdata = 4095,
.i_NbrTTLChannel = 24,
.b_AvailableConvertUnit = 6, .b_AvailableConvertUnit = 6,
.ui_MinAcquisitiontimeNs = 5000, .ui_MinAcquisitiontimeNs = 5000,
.has_dig_in = 1, .has_dig_in = 1,
.has_dig_out = 1, .has_dig_out = 1,
.has_ttl_io = 1,
}, },
[BOARD_APCI3110_8_4] = { [BOARD_APCI3110_8_4] = {
.pc_DriverName = "apci3110-8-4", .pc_DriverName = "apci3110-8-4",
...@@ -294,11 +294,11 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = { ...@@ -294,11 +294,11 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
.i_NbrAoChannel = 4, .i_NbrAoChannel = 4,
.i_AiMaxdata = 4095, .i_AiMaxdata = 4095,
.i_AoMaxdata = 4095, .i_AoMaxdata = 4095,
.i_NbrTTLChannel = 24,
.b_AvailableConvertUnit = 6, .b_AvailableConvertUnit = 6,
.ui_MinAcquisitiontimeNs = 5000, .ui_MinAcquisitiontimeNs = 5000,
.has_dig_in = 1, .has_dig_in = 1,
.has_dig_out = 1, .has_dig_out = 1,
.has_ttl_io = 1,
}, },
[BOARD_APCI3116_16_4] = { [BOARD_APCI3116_16_4] = {
.pc_DriverName = "apci3116-16-4", .pc_DriverName = "apci3116-16-4",
...@@ -308,11 +308,11 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = { ...@@ -308,11 +308,11 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
.i_NbrAoChannel = 4, .i_NbrAoChannel = 4,
.i_AiMaxdata = 65535, .i_AiMaxdata = 65535,
.i_AoMaxdata = 4095, .i_AoMaxdata = 4095,
.i_NbrTTLChannel = 24,
.b_AvailableConvertUnit = 6, .b_AvailableConvertUnit = 6,
.ui_MinAcquisitiontimeNs = 5000, .ui_MinAcquisitiontimeNs = 5000,
.has_dig_in = 1, .has_dig_in = 1,
.has_dig_out = 1, .has_dig_out = 1,
.has_ttl_io = 1,
}, },
[BOARD_APCI3116_8_4] = { [BOARD_APCI3116_8_4] = {
.pc_DriverName = "apci3116-8-4", .pc_DriverName = "apci3116-8-4",
...@@ -322,11 +322,11 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = { ...@@ -322,11 +322,11 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
.i_NbrAoChannel = 4, .i_NbrAoChannel = 4,
.i_AiMaxdata = 65535, .i_AiMaxdata = 65535,
.i_AoMaxdata = 4095, .i_AoMaxdata = 4095,
.i_NbrTTLChannel = 24,
.b_AvailableConvertUnit = 6, .b_AvailableConvertUnit = 6,
.ui_MinAcquisitiontimeNs = 5000, .ui_MinAcquisitiontimeNs = 5000,
.has_dig_in = 1, .has_dig_in = 1,
.has_dig_out = 1, .has_dig_out = 1,
.has_ttl_io = 1,
}, },
[BOARD_APCI3003] = { [BOARD_APCI3003] = {
.pc_DriverName = "apci3003", .pc_DriverName = "apci3003",
...@@ -372,7 +372,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = { ...@@ -372,7 +372,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
.pc_DriverName = "apci3500", .pc_DriverName = "apci3500",
.i_NbrAoChannel = 4, .i_NbrAoChannel = 4,
.i_AoMaxdata = 4095, .i_AoMaxdata = 4095,
.i_NbrTTLChannel = 24, .has_ttl_io = 1,
}, },
}; };
...@@ -609,14 +609,13 @@ static int apci3xxx_auto_attach(struct comedi_device *dev, ...@@ -609,14 +609,13 @@ static int apci3xxx_auto_attach(struct comedi_device *dev,
/* Allocate and Initialise TTL */ /* Allocate and Initialise TTL */
s = &dev->subdevices[5]; s = &dev->subdevices[5];
if (board->i_NbrTTLChannel) { if (board->has_ttl_io) {
s->type = COMEDI_SUBD_DIO; s->type = COMEDI_SUBD_DIO;
s->subdev_flags = s->subdev_flags =
SDF_WRITEABLE | SDF_READABLE | SDF_GROUND | SDF_COMMON; SDF_WRITEABLE | SDF_READABLE | SDF_GROUND | SDF_COMMON;
s->n_chan = board->i_NbrTTLChannel; s->n_chan = 24;
s->maxdata = 1; s->maxdata = 1;
s->io_bits = 0; /* all bits input */ s->io_bits = 0; /* all bits input */
s->len_chanlist = board->i_NbrTTLChannel;
s->range_table = &range_digital; s->range_table = &range_digital;
s->insn_config = i_APCI3XXX_InsnConfigInitTTLIO; s->insn_config = i_APCI3XXX_InsnConfigInitTTLIO;
s->insn_bits = i_APCI3XXX_InsnBitsTTLIO; s->insn_bits = i_APCI3XXX_InsnBitsTTLIO;
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7