Commit 19aab073 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: cb_pcidas: use comedi_range_is_unipolar()

Instead of relying on the IS_UNIPOLAR mask value, use the comedi
helper function to check if the range is unipolar.
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 9846ec3a
...@@ -171,8 +171,6 @@ static inline unsigned int DAC_CHAN_EN(unsigned int channel) ...@@ -171,8 +171,6 @@ static inline unsigned int DAC_CHAN_EN(unsigned int channel)
#define PCIDAS_AO_FIFO_REG 0x00 #define PCIDAS_AO_FIFO_REG 0x00
#define PCIDAS_AO_FIFO_CLR_REG 0x02 #define PCIDAS_AO_FIFO_CLR_REG 0x02
#define IS_UNIPOLAR 0x4 /* unipolar range mask */
/* analog input ranges for most boards */ /* analog input ranges for most boards */
static const struct comedi_lrange cb_pcidas_ranges = { static const struct comedi_lrange cb_pcidas_ranges = {
8, { 8, {
...@@ -371,7 +369,7 @@ static int cb_pcidas_ai_rinsn(struct comedi_device *dev, ...@@ -371,7 +369,7 @@ static int cb_pcidas_ai_rinsn(struct comedi_device *dev,
/* set mux limits and gain */ /* set mux limits and gain */
bits = BEGIN_SCAN(chan) | END_SCAN(chan) | GAIN_BITS(range); bits = BEGIN_SCAN(chan) | END_SCAN(chan) | GAIN_BITS(range);
/* set unipolar/bipolar */ /* set unipolar/bipolar */
if (range & IS_UNIPOLAR) if (comedi_range_is_unipolar(s, range))
bits |= UNIP; bits |= UNIP;
/* set single-ended/differential */ /* set single-ended/differential */
if (aref != AREF_DIFF) if (aref != AREF_DIFF)
...@@ -857,6 +855,7 @@ static int cb_pcidas_ai_cmd(struct comedi_device *dev, ...@@ -857,6 +855,7 @@ static int cb_pcidas_ai_cmd(struct comedi_device *dev,
struct cb_pcidas_private *devpriv = dev->private; struct cb_pcidas_private *devpriv = dev->private;
struct comedi_async *async = s->async; struct comedi_async *async = s->async;
struct comedi_cmd *cmd = &async->cmd; struct comedi_cmd *cmd = &async->cmd;
unsigned int range0 = CR_RANGE(cmd->chanlist[0]);
unsigned int bits; unsigned int bits;
unsigned long flags; unsigned long flags;
...@@ -870,9 +869,9 @@ static int cb_pcidas_ai_cmd(struct comedi_device *dev, ...@@ -870,9 +869,9 @@ static int cb_pcidas_ai_cmd(struct comedi_device *dev,
/* set mux limits, gain and pacer source */ /* set mux limits, gain and pacer source */
bits = BEGIN_SCAN(CR_CHAN(cmd->chanlist[0])) | bits = BEGIN_SCAN(CR_CHAN(cmd->chanlist[0])) |
END_SCAN(CR_CHAN(cmd->chanlist[cmd->chanlist_len - 1])) | END_SCAN(CR_CHAN(cmd->chanlist[cmd->chanlist_len - 1])) |
GAIN_BITS(CR_RANGE(cmd->chanlist[0])); GAIN_BITS(range0);
/* set unipolar/bipolar */ /* set unipolar/bipolar */
if (CR_RANGE(cmd->chanlist[0]) & IS_UNIPOLAR) if (comedi_range_is_unipolar(s, range0))
bits |= UNIP; bits |= UNIP;
/* set singleended/differential */ /* set singleended/differential */
if (CR_AREF(cmd->chanlist[0]) != AREF_DIFF) if (CR_AREF(cmd->chanlist[0]) != AREF_DIFF)
......
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