summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Abbott2015-07-07 19:06:07 +0200
committerGreg Kroah-Hartman2015-07-15 03:22:19 +0200
commit4fff0fea6d8821b1e521b7d38ea6d69c47e21efc (patch)
tree3d00110045ab4be93a76b97fde88a9ffc3ccf572
parentstaging: comedi: Grammar s/Enable support a/Enable support for a/ (diff)
downloadkernel-qcow2-linux-4fff0fea6d8821b1e521b7d38ea6d69c47e21efc.tar.gz
kernel-qcow2-linux-4fff0fea6d8821b1e521b7d38ea6d69c47e21efc.tar.xz
kernel-qcow2-linux-4fff0fea6d8821b1e521b7d38ea6d69c47e21efc.zip
staging: comedi: cb_pcimdas: add external analog output ranges
The analog output range is not programmable, but the ranges for each of the two analog output channels are settable via jumpers. These jumper settings are not readable by the driver. The driver provides a range table containing all the possible internal ranges (+/-10V, +/-5V, 0-10V, 0-5V) to provide information to the user application (although any range selected by the application that differs from the jumper settings will not produce the expected voltage output). The range table does not cover all possible ranges of the analog output channels. The jumpers also allow an external reference voltage between 0 and 10V to be used as bipolar or unipolar output range. Add a couple more ranges to the end of the range table to define these two external ranges. 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/cb_pcimdas.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/staging/comedi/drivers/cb_pcimdas.c b/drivers/staging/comedi/drivers/cb_pcimdas.c
index 4ebf5aae5019..47e38398921e 100644
--- a/drivers/staging/comedi/drivers/cb_pcimdas.c
+++ b/drivers/staging/comedi/drivers/cb_pcimdas.c
@@ -141,11 +141,13 @@ static const struct comedi_lrange cb_pcimdas_ai_uni_range = {
* jumper-settable on the board. The settings are not software-readable.
*/
static const struct comedi_lrange cb_pcimdas_ao_range = {
- 4, {
+ 6, {
BIP_RANGE(10),
BIP_RANGE(5),
UNI_RANGE(10),
- UNI_RANGE(5)
+ UNI_RANGE(5),
+ RANGE_ext(-1, 1),
+ RANGE_ext(0, 1)
}
};