Commit 9b3e5aec authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: dt282x: fix dt282x_dio_insn_config()

This is the (*insn_config) function for a DIO subdevice. It should be
using the data[0] value as the "instruction" to perform on the subdevice.

Use the comedi_dio_insn_config() helper to properly handle instructions.
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 c7fe22f6
...@@ -982,29 +982,32 @@ static int dt282x_dio_insn_bits(struct comedi_device *dev, ...@@ -982,29 +982,32 @@ static int dt282x_dio_insn_bits(struct comedi_device *dev,
static int dt282x_dio_insn_config(struct comedi_device *dev, static int dt282x_dio_insn_config(struct comedi_device *dev,
struct comedi_subdevice *s, struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data) struct comedi_insn *insn,
unsigned int *data)
{ {
struct dt282x_private *devpriv = dev->private; struct dt282x_private *devpriv = dev->private;
int mask; unsigned int chan = CR_CHAN(insn->chanspec);
unsigned int mask;
int ret;
mask = (CR_CHAN(insn->chanspec) < 8) ? 0x00ff : 0xff00; if (chan < 8)
if (data[0]) mask = 0x00ff;
s->io_bits |= mask;
else else
s->io_bits &= ~mask; mask = 0xff00;
ret = comedi_dio_insn_config(dev, s, insn, data, mask);
if (ret)
return ret;
devpriv->dacsr &= ~(DT2821_LBOE | DT2821_HBOE);
if (s->io_bits & 0x00ff) if (s->io_bits & 0x00ff)
devpriv->dacsr |= DT2821_LBOE; devpriv->dacsr |= DT2821_LBOE;
else
devpriv->dacsr &= ~DT2821_LBOE;
if (s->io_bits & 0xff00) if (s->io_bits & 0xff00)
devpriv->dacsr |= DT2821_HBOE; devpriv->dacsr |= DT2821_HBOE;
else
devpriv->dacsr &= ~DT2821_HBOE;
outw(devpriv->dacsr, dev->iobase + DT2821_DACSR); outw(devpriv->dacsr, dev->iobase + DT2821_DACSR);
return 1; return insn->n;
} }
static const struct comedi_lrange *const ai_range_table[] = { static const struct comedi_lrange *const ai_range_table[] = {
......
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