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

staging: comedi: pcmda12: cleanup pcmda12_ao_insn_write()

Only the last value needs to be saved for readback.

Remove the LSB and MSB macros.

(*insn_write) functions should return an errno or the number of
samples actually read. Change the final return to insn->n to
make this clear.
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 cac10bf9
...@@ -51,8 +51,6 @@ Configuration Options: ...@@ -51,8 +51,6 @@ Configuration Options:
#define CHANS 8 #define CHANS 8
#define IOSIZE 16 #define IOSIZE 16
#define LSB(x) ((unsigned char)((x) & 0xff))
#define MSB(x) ((unsigned char)((((unsigned short)(x))>>8) & 0xff))
#define LSB_PORT(chan) (dev->iobase + (chan)*2) #define LSB_PORT(chan) (dev->iobase + (chan)*2)
#define MSB_PORT(chan) (LSB_PORT(chan)+1) #define MSB_PORT(chan) (LSB_PORT(chan)+1)
...@@ -90,31 +88,25 @@ static int pcmda12_ao_insn_write(struct comedi_device *dev, ...@@ -90,31 +88,25 @@ static int pcmda12_ao_insn_write(struct comedi_device *dev,
unsigned int *data) unsigned int *data)
{ {
struct pcmda12_private *devpriv = dev->private; struct pcmda12_private *devpriv = dev->private;
unsigned int chan = CR_CHAN(insn->chanspec);
unsigned int val = devpriv->ao_readback[chan];
int i; int i;
int chan = CR_CHAN(insn->chanspec);
/* Writing a list of values to an AO channel is probably not
* very useful, but that's how the interface is defined. */
for (i = 0; i < insn->n; ++i) { for (i = 0; i < insn->n; ++i) {
val = data[i];
/* /\* do this as one instruction?? *\/ */ outb(val & 0xff, LSB_PORT(chan));
/* outw(data[i], LSB_PORT(chan)); */ outb((val >> 8) & 0xff, MSB_PORT(chan));
/* Need to do this as two instructions due to 8-bit bus?? */ /*
/* first, load the low byte */ * Initiate transfer if not in simultaneaous xfer
outb(LSB(data[i]), LSB_PORT(chan)); * mode by reading one of the AO registers.
/* next, write the high byte */ */
outb(MSB(data[i]), MSB_PORT(chan));
/* save shadow register */
devpriv->ao_readback[chan] = data[i];
if (!devpriv->simultaneous_xfer_mode) if (!devpriv->simultaneous_xfer_mode)
inb(LSB_PORT(chan)); inb(LSB_PORT(chan));
} }
devpriv->ao_readback[chan] = val;
/* return the number of samples written */ return insn->n;
return i;
} }
static int pcmda12_ao_insn_read(struct comedi_device *dev, static int pcmda12_ao_insn_read(struct comedi_device *dev,
......
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