diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2013-07-25 23:04:17 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-26 22:09:54 (GMT) |
| commit | 91891f7cc6453bec358a3bc2a0cf9a0b2f8223d5 (patch) | |
| tree | 593a4795b814c4b91d0c231b7e9d5f05e155a4e6 /drivers/staging/comedi | |
| parent | a79b4cdb52151dab5c5b2a86ab7619bc457470a8 (diff) | |
| download | linux-fsl-qoriq-91891f7cc6453bec358a3bc2a0cf9a0b2f8223d5.tar.xz | |
staging: comedi: usbdux: clarify bipolar ai data
Use the comedi_range_is_bipolar() helper instead of checking the
'range' index against a magic number.
Also, use the s->maxdata to calculate the value needed to munge the
value for bipolar data instead of the magic number.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/comedi')
| -rw-r--r-- | drivers/staging/comedi/drivers/usbdux.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/staging/comedi/drivers/usbdux.c b/drivers/staging/comedi/drivers/usbdux.c index a536fa3..a81b4b1 100644 --- a/drivers/staging/comedi/drivers/usbdux.c +++ b/drivers/staging/comedi/drivers/usbdux.c @@ -1002,8 +1002,10 @@ static int usbdux_ai_insn_read(struct comedi_device *dev, goto ai_read_exit; val = le16_to_cpu(devpriv->insn_buffer[1]); - if (range <= 1) - val ^= 0x800; + + /* bipolar data is two's-complement */ + if (comedi_range_is_bipolar(s, range)) + val ^= ((s->maxdata + 1) >> 1); data[i] = val; } |