Skip to content

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

staging: comedi: addi_apci_3xxx: rename 'ui_MinAcquisitiontimeNs' 

Rename this CamelCase boardinfo variable.
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 a67e0cc7
Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 26 deletions
drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.c
View file @ 8edd4425
......@@ -71,7 +71,7 @@ static int apci3xxx_ai_configure(struct comedi_device *dev,
}
/* Test the convert time value */
if (acq_ns < board->ui_MinAcquisitiontimeNs)
if (acq_ns < board->ai_min_acq_ns)
return -EINVAL;
/* Test if conversion not started */
......
drivers/staging/comedi/drivers/addi_apci_3xxx.c
View file @ 8edd4425
......@@ -86,7 +86,7 @@ struct apci3xxx_boardinfo {
int i_NbrAiChannelDiff;
unsigned int ai_maxdata;
unsigned char ai_conv_units;
unsigned int ui_MinAcquisitiontimeNs;
unsigned int ai_min_acq_ns;
unsigned int has_ao:1;
unsigned int has_dig_in:1;
unsigned int has_dig_out:1;
......@@ -101,7 +101,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
.i_NbrAiChannelDiff = 8,
.ai_maxdata = 0x0fff,
.ai_conv_units = CONV_UNIT_MS | CONV_UNIT_US,
.ui_MinAcquisitiontimeNs = 10000,
.ai_min_acq_ns = 10000,
.has_ttl_io = 1,
},
[BOARD_APCI3000_8] = {
......@@ -111,7 +111,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
.i_NbrAiChannelDiff = 4,
.ai_maxdata = 0x0fff,
.ai_conv_units = CONV_UNIT_MS | CONV_UNIT_US,
.ui_MinAcquisitiontimeNs = 10000,
.ai_min_acq_ns = 10000,
.has_ttl_io = 1,
},
[BOARD_APCI3000_4] = {
......@@ -121,7 +121,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
.i_NbrAiChannelDiff = 2,
.ai_maxdata = 0x0fff,
.ai_conv_units = CONV_UNIT_MS | CONV_UNIT_US,
.ui_MinAcquisitiontimeNs = 10000,
.ai_min_acq_ns = 10000,
.has_ttl_io = 1,
},
[BOARD_APCI3006_16] = {
......@@ -131,7 +131,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
.i_NbrAiChannelDiff = 8,
.ai_maxdata = 0xffff,
.ai_conv_units = CONV_UNIT_MS | CONV_UNIT_US,
.ui_MinAcquisitiontimeNs = 10000,
.ai_min_acq_ns = 10000,
.has_ttl_io = 1,
},
[BOARD_APCI3006_8] = {
......@@ -141,7 +141,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
.i_NbrAiChannelDiff = 4,
.ai_maxdata = 0xffff,
.ai_conv_units = CONV_UNIT_MS | CONV_UNIT_US,
.ui_MinAcquisitiontimeNs = 10000,
.ai_min_acq_ns = 10000,
.has_ttl_io = 1,
},
[BOARD_APCI3006_4] = {
......@@ -151,7 +151,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
.i_NbrAiChannelDiff = 2,
.ai_maxdata = 0xffff,
.ai_conv_units = CONV_UNIT_MS | CONV_UNIT_US,
.ui_MinAcquisitiontimeNs = 10000,
.ai_min_acq_ns = 10000,
.has_ttl_io = 1,
},
[BOARD_APCI3010_16] = {
......@@ -161,7 +161,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
.i_NbrAiChannelDiff = 8,
.ai_maxdata = 0x0fff,
.ai_conv_units = CONV_UNIT_MS | CONV_UNIT_US,
.ui_MinAcquisitiontimeNs = 5000,
.ai_min_acq_ns = 5000,
.has_dig_in = 1,
.has_dig_out = 1,
.has_ttl_io = 1,
......@@ -173,7 +173,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
.i_NbrAiChannelDiff = 4,
.ai_maxdata = 0x0fff,
.ai_conv_units = CONV_UNIT_MS | CONV_UNIT_US,
.ui_MinAcquisitiontimeNs = 5000,
.ai_min_acq_ns = 5000,
.has_dig_in = 1,
.has_dig_out = 1,
.has_ttl_io = 1,
......@@ -185,7 +185,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
.i_NbrAiChannelDiff = 2,
.ai_maxdata = 0x0fff,
.ai_conv_units = CONV_UNIT_MS | CONV_UNIT_US,
.ui_MinAcquisitiontimeNs = 5000,
.ai_min_acq_ns = 5000,
.has_dig_in = 1,
.has_dig_out = 1,
.has_ttl_io = 1,
......@@ -197,7 +197,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
.i_NbrAiChannelDiff = 8,
.ai_maxdata = 0xffff,
.ai_conv_units = CONV_UNIT_MS | CONV_UNIT_US,
.ui_MinAcquisitiontimeNs = 5000,
.ai_min_acq_ns = 5000,
.has_dig_in = 1,
.has_dig_out = 1,
.has_ttl_io = 1,
......@@ -209,7 +209,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
.i_NbrAiChannelDiff = 4,
.ai_maxdata = 0xffff,
.ai_conv_units = CONV_UNIT_MS | CONV_UNIT_US,
.ui_MinAcquisitiontimeNs = 5000,
.ai_min_acq_ns = 5000,
.has_dig_in = 1,
.has_dig_out = 1,
.has_ttl_io = 1,
......@@ -221,7 +221,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
.i_NbrAiChannelDiff = 2,
.ai_maxdata = 0xffff,
.ai_conv_units = CONV_UNIT_MS | CONV_UNIT_US,
.ui_MinAcquisitiontimeNs = 5000,
.ai_min_acq_ns = 5000,
.has_dig_in = 1,
.has_dig_out = 1,
.has_ttl_io = 1,
......@@ -233,7 +233,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
.i_NbrAiChannelDiff = 8,
.ai_maxdata = 0x0fff,
.ai_conv_units = CONV_UNIT_MS | CONV_UNIT_US,
.ui_MinAcquisitiontimeNs = 10000,
.ai_min_acq_ns = 10000,
.has_ao = 1,
.has_ttl_io = 1,
},
......@@ -244,7 +244,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
.i_NbrAiChannelDiff = 4,
.ai_maxdata = 0x0fff,
.ai_conv_units = CONV_UNIT_MS | CONV_UNIT_US,
.ui_MinAcquisitiontimeNs = 10000,
.ai_min_acq_ns = 10000,
.has_ao = 1,
.has_ttl_io = 1,
},
......@@ -255,7 +255,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
.i_NbrAiChannelDiff = 8,
.ai_maxdata = 0xffff,
.ai_conv_units = CONV_UNIT_MS | CONV_UNIT_US,
.ui_MinAcquisitiontimeNs = 10000,
.ai_min_acq_ns = 10000,
.has_ao = 1,
.has_ttl_io = 1,
},
......@@ -266,7 +266,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
.i_NbrAiChannelDiff = 4,
.ai_maxdata = 0xffff,
.ai_conv_units = CONV_UNIT_MS | CONV_UNIT_US,
.ui_MinAcquisitiontimeNs = 10000,
.ai_min_acq_ns = 10000,
.has_ao = 1,
.has_ttl_io = 1,
},
......@@ -277,7 +277,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
.i_NbrAiChannelDiff = 8,
.ai_maxdata = 0x0fff,
.ai_conv_units = CONV_UNIT_MS | CONV_UNIT_US,
.ui_MinAcquisitiontimeNs = 5000,
.ai_min_acq_ns = 5000,
.has_ao = 1,
.has_dig_in = 1,
.has_dig_out = 1,
......@@ -290,7 +290,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
.i_NbrAiChannelDiff = 4,
.ai_maxdata = 0x0fff,
.ai_conv_units = CONV_UNIT_MS | CONV_UNIT_US,
.ui_MinAcquisitiontimeNs = 5000,
.ai_min_acq_ns = 5000,
.has_ao = 1,
.has_dig_in = 1,
.has_dig_out = 1,
......@@ -303,7 +303,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
.i_NbrAiChannelDiff = 8,
.ai_maxdata = 0xffff,
.ai_conv_units = CONV_UNIT_MS | CONV_UNIT_US,
.ui_MinAcquisitiontimeNs = 5000,
.ai_min_acq_ns = 5000,
.has_ao = 1,
.has_dig_in = 1,
.has_dig_out = 1,
......@@ -316,7 +316,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
.i_NbrAiChannelDiff = 4,
.ai_maxdata = 0xffff,
.ai_conv_units = CONV_UNIT_MS | CONV_UNIT_US,
.ui_MinAcquisitiontimeNs = 5000,
.ai_min_acq_ns = 5000,
.has_ao = 1,
.has_dig_in = 1,
.has_dig_out = 1,
......@@ -329,7 +329,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
.ai_maxdata = 0xffff,
.ai_conv_units = CONV_UNIT_MS | CONV_UNIT_US |
CONV_UNIT_NS,
.ui_MinAcquisitiontimeNs = 2500,
.ai_min_acq_ns = 2500,
.has_dig_in = 1,
.has_dig_out = 1,
},
......@@ -339,7 +339,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
.i_NbrAiChannelDiff = 16,
.ai_maxdata = 0xffff,
.ai_conv_units = CONV_UNIT_MS | CONV_UNIT_US,
.ui_MinAcquisitiontimeNs = 5000,
.ai_min_acq_ns = 5000,
.has_dig_in = 1,
.has_dig_out = 1,
},
......@@ -349,7 +349,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
.i_NbrAiChannelDiff = 8,
.ai_maxdata = 0xffff,
.ai_conv_units = CONV_UNIT_MS | CONV_UNIT_US,
.ui_MinAcquisitiontimeNs = 5000,
.ai_min_acq_ns = 5000,
.has_dig_in = 1,
.has_dig_out = 1,
},
......@@ -359,7 +359,7 @@ static const struct apci3xxx_boardinfo apci3xxx_boardtypes[] = {
.i_NbrAiChannelDiff = 4,
.ai_maxdata = 0xffff,
.ai_conv_units = CONV_UNIT_MS | CONV_UNIT_US,
.ui_MinAcquisitiontimeNs = 5000,
.ai_min_acq_ns = 5000,
.has_dig_in = 1,
.has_dig_out = 1,
},
......
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