diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2013-03-22 09:48:44 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-25 11:42:58 -0700 |
| commit | 8c2bc333af026bed05a0041b028c34ef9b5c9cab (patch) | |
| tree | 4e50834bf09bf850479a8a5ca9a64f70cd6e1709 | |
| parent | 73f2b1d26f3d97f7c34166d22b30f89dc9cf9402 (diff) | |
staging: comedi: ni_labpc: introduce labpc_ai_set_chan_and_gain()
Introduce a helper function to set the channel and gain bits in the
COMMAND1_REG.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_labpc.c | 39 |
1 files changed, 22 insertions, 17 deletions
diff --git a/drivers/staging/comedi/drivers/ni_labpc.c b/drivers/staging/comedi/drivers/ni_labpc.c index 0b68e13e2377..dbc358970171 100644 --- a/drivers/staging/comedi/drivers/ni_labpc.c +++ b/drivers/staging/comedi/drivers/ni_labpc.c @@ -354,6 +354,25 @@ static bool labpc_range_is_unipolar(struct comedi_subdevice *s, return true; } +static void labpc_ai_set_chan_and_gain(struct comedi_device *dev, + enum scan_mode mode, + unsigned int chan, + unsigned int range, + unsigned int aref) +{ + const struct labpc_boardinfo *board = comedi_board(dev); + struct labpc_private *devpriv = dev->private; + + /* munge channel bits for differential/scan disabled mode */ + if ((mode == MODE_SINGLE_CHAN || mode == MODE_SINGLE_CHAN_INTERVAL) && + aref == AREF_DIFF) + chan *= 2; + devpriv->cmd1 = ADC_CHAN_BITS(chan); + devpriv->cmd1 |= board->ai_range_code[range]; + + devpriv->write_byte(devpriv->cmd1, dev->iobase + COMMAND1_REG); +} + static void labpc_clear_adc_fifo(const struct comedi_device *dev) { struct labpc_private *devpriv = dev->private; @@ -388,14 +407,7 @@ static int labpc_ai_insn_read(struct comedi_device *dev, devpriv->cmd3 = 0; devpriv->write_byte(devpriv->cmd3, dev->iobase + COMMAND3_REG); - /* set gain and channel */ - devpriv->cmd1 = 0; - devpriv->cmd1 |= board->ai_range_code[range]; - /* munge channel bits for differential/scan disabled mode */ - if (aref == AREF_DIFF) - chan *= 2; - devpriv->cmd1 |= ADC_CHAN_BITS(chan); - devpriv->write_byte(devpriv->cmd1, dev->iobase + COMMAND1_REG); + labpc_ai_set_chan_and_gain(dev, MODE_SINGLE_CHAN, chan, range, aref); /* setup cmd6 register for 1200 boards */ if (board->register_layout == labpc_1200_layout) { @@ -950,15 +962,8 @@ static int labpc_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) devpriv->write_byte(devpriv->cmd6, dev->iobase + COMMAND6_REG); } - /* setup channel list, etc (cmd1 register) */ - devpriv->cmd1 = 0; - /* munge channel bits for differential / scan disabled mode */ - if ((mode == MODE_SINGLE_CHAN || mode == MODE_SINGLE_CHAN_INTERVAL) && - aref == AREF_DIFF) - chan *= 2; - devpriv->cmd1 |= ADC_CHAN_BITS(chan); - devpriv->cmd1 |= board->ai_range_code[range]; - devpriv->write_byte(devpriv->cmd1, dev->iobase + COMMAND1_REG); + labpc_ai_set_chan_and_gain(dev, mode, chan, range, aref); + /* manual says to set scan enable bit on second pass */ if (mode == MODE_MULT_CHAN_UP || mode == MODE_MULT_CHAN_DOWN) { devpriv->cmd1 |= ADC_SCAN_EN_BIT; |