Commit 3e5cf6d4 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: adv_pci1710: tidy up pci1720_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 e4623cee
...@@ -636,35 +636,34 @@ static int pci171x_insn_counter_config(struct comedi_device *dev, ...@@ -636,35 +636,34 @@ static int pci171x_insn_counter_config(struct comedi_device *dev,
return 1; return 1;
} }
/* static int pci1720_ao_insn_write(struct comedi_device *dev,
==============================================================================
*/
static int pci1720_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 chan = CR_CHAN(insn->chanspec);
unsigned int range = CR_RANGE(insn->chanspec);
unsigned int val; unsigned int val;
int n, rangereg, chan; int i;
chan = CR_CHAN(insn->chanspec); val = devpriv->da_ranges & (~(0x03 << (chan << 1)));
rangereg = devpriv->da_ranges & (~(0x03 << (chan << 1))); val |= (range << (chan << 1));
rangereg |= (CR_RANGE(insn->chanspec) << (chan << 1)); if (val != devpriv->da_ranges) {
if (rangereg != devpriv->da_ranges) { outb(val, dev->iobase + PCI1720_RANGE);
outb(rangereg, dev->iobase + PCI1720_RANGE); devpriv->da_ranges = val;
devpriv->da_ranges = rangereg;
} }
val = s->readback[chan];
for (n = 0; n < insn->n; n++) { val = s->readback[chan];
val = data[n]; for (i = 0; i < insn->n; i++) {
val = data[i];
outw(val, dev->iobase + PCI1720_DA0 + (chan << 1)); outw(val, dev->iobase + PCI1720_DA0 + (chan << 1));
outb(0, dev->iobase + PCI1720_SYNCOUT); /* update outputs */ outb(0, dev->iobase + PCI1720_SYNCOUT); /* update outputs */
} }
s->readback[chan] = val; s->readback[chan] = val;
return n; return insn->n;
} }
/* /*
...@@ -1118,7 +1117,7 @@ static int pci1710_auto_attach(struct comedi_device *dev, ...@@ -1118,7 +1117,7 @@ static int pci1710_auto_attach(struct comedi_device *dev,
switch (this_board->cardtype) { switch (this_board->cardtype) {
case TYPE_PCI1720: case TYPE_PCI1720:
s->n_chan = 4; s->n_chan = 4;
s->insn_write = pci1720_insn_write_ao; s->insn_write = pci1720_ao_insn_write;
break; break;
default: default:
s->n_chan = 2; s->n_chan = 2;
......
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