Commit 20fb170b authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: adl_pci6208: save raw data for analog output readback

This driver munges the raw data from the comedi core into its two's
complement form before writing it to the hardware. The last value
written to the hardware is saved in the private data for readback.

Since the comedi core always expects the data to be in offset binary
coding, make sure to save the un-munged value for readback.

Also, prefetch the current readback value before attempting to update
the hardware. This ensures that the readback value is correct if no
values are actually written.
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 e2aad1d5
...@@ -88,21 +88,21 @@ static int pci6208_ao_winsn(struct comedi_device *dev, ...@@ -88,21 +88,21 @@ static int pci6208_ao_winsn(struct comedi_device *dev,
{ {
struct pci6208_private *devpriv = dev->private; struct pci6208_private *devpriv = dev->private;
int chan = CR_CHAN(insn->chanspec); int chan = CR_CHAN(insn->chanspec);
unsigned long invert = 1 << (16 - 1); unsigned int invert = 1 << (16 - 1);
unsigned long value = 0; unsigned int val = devpriv->ao_readback[chan];
unsigned short status; unsigned short status;
int i; int i;
for (i = 0; i < insn->n; i++) { for (i = 0; i < insn->n; i++) {
value = data[i] ^ invert; val = data[i];
do { do {
status = inw(dev->iobase + PCI6208_AO_STATUS); status = inw(dev->iobase + PCI6208_AO_STATUS);
} while (status & PCI6208_AO_STATUS_DATA_SEND); } while (status & PCI6208_AO_STATUS_DATA_SEND);
outw(value, dev->iobase + PCI6208_AO_CONTROL(chan)); outw(val ^ invert, dev->iobase + PCI6208_AO_CONTROL(chan));
} }
devpriv->ao_readback[chan] = value; devpriv->ao_readback[chan] = val;
return insn->n; return insn->n;
} }
......
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