Commit 2d21fc22 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: adv_pci1710: tidy up pci171x_insn_write_ao()

For aesthetics, rename this function and tidy it up.
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 3e5cf6d4
...@@ -466,41 +466,30 @@ static int pci171x_insn_read_ai(struct comedi_device *dev, ...@@ -466,41 +466,30 @@ static int pci171x_insn_read_ai(struct comedi_device *dev,
return ret ? ret : insn->n; return ret ? ret : insn->n;
} }
/* static int pci171x_ao_insn_write(struct comedi_device *dev,
==============================================================================
*/
static int pci171x_insn_write_ao(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 pci1710_private *devpriv = dev->private; struct pci1710_private *devpriv = dev->private;
unsigned int val; unsigned int chan = CR_CHAN(insn->chanspec);
int n, chan, range, ofs; unsigned int range = CR_RANGE(insn->chanspec);
unsigned int reg = chan ? PCI171x_DA2 : PCI171x_DA1;
chan = CR_CHAN(insn->chanspec); unsigned int val = s->readback[chan];
range = CR_RANGE(insn->chanspec); int i;
if (chan) {
devpriv->da_ranges &= 0xfb; devpriv->da_ranges &= ~(1 << (chan << 1));
devpriv->da_ranges |= (range << 2); devpriv->da_ranges |= (range << (chan << 1));
outw(devpriv->da_ranges, dev->iobase + PCI171x_DAREF); outw(devpriv->da_ranges, dev->iobase + PCI171x_DAREF);
ofs = PCI171x_DA2;
} else {
devpriv->da_ranges &= 0xfe;
devpriv->da_ranges |= range;
outw(devpriv->da_ranges, dev->iobase + PCI171x_DAREF);
ofs = PCI171x_DA1;
}
val = s->readback[chan];
for (n = 0; n < insn->n; n++) { for (i = 0; i < insn->n; i++) {
val = data[n]; val = data[i];
outw(val, dev->iobase + ofs); outw(val, dev->iobase + reg);
} }
s->readback[chan] = val; s->readback[chan] = val;
return n; return insn->n;
} }
/* /*
...@@ -1121,7 +1110,7 @@ static int pci1710_auto_attach(struct comedi_device *dev, ...@@ -1121,7 +1110,7 @@ static int pci1710_auto_attach(struct comedi_device *dev,
break; break;
default: default:
s->n_chan = 2; s->n_chan = 2;
s->insn_write = pci171x_insn_write_ao; s->insn_write = pci171x_ao_insn_write;
break; break;
} }
......
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