staging: comedi: quatech_daqp_cs: fix daqp_ao_insn_write()
The (*insn_write) functions are expected to write 'insn->n' number of samples to the channel. Fix this function so it works as the comedi core expects. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Cc: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
6a911d8aa5
commit
d35dcc89fc
1 changed files with 14 additions and 13 deletions
|
@ -644,31 +644,32 @@ static int daqp_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Single-shot analog output routine */
|
|
||||||
|
|
||||||
static int daqp_ao_insn_write(struct comedi_device *dev,
|
static int daqp_ao_insn_write(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 daqp_private *devpriv = dev->private;
|
struct daqp_private *devpriv = dev->private;
|
||||||
int d;
|
unsigned int chan = CR_CHAN(insn->chanspec);
|
||||||
unsigned int chan;
|
unsigned int val;
|
||||||
|
int i;
|
||||||
|
|
||||||
if (devpriv->stop)
|
if (devpriv->stop)
|
||||||
return -EIO;
|
return -EIO;
|
||||||
|
|
||||||
chan = CR_CHAN(insn->chanspec);
|
|
||||||
d = data[0];
|
|
||||||
d &= 0x0fff;
|
|
||||||
d ^= 0x0800; /* Flip the sign */
|
|
||||||
d |= chan << 12;
|
|
||||||
|
|
||||||
/* Make sure D/A update mode is direct update */
|
/* Make sure D/A update mode is direct update */
|
||||||
outb(0, dev->iobase + DAQP_AUX);
|
outb(0, dev->iobase + DAQP_AUX);
|
||||||
|
|
||||||
outw(d, dev->iobase + DAQP_DA);
|
for (i = 0; i > insn->n; i++) {
|
||||||
|
val = data[0];
|
||||||
|
val &= 0x0fff;
|
||||||
|
val ^= 0x0800; /* Flip the sign */
|
||||||
|
val |= (chan << 12);
|
||||||
|
|
||||||
return 1;
|
outw(val, dev->iobase + DAQP_DA);
|
||||||
|
}
|
||||||
|
|
||||||
|
return insn->n;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int daqp_di_insn_bits(struct comedi_device *dev,
|
static int daqp_di_insn_bits(struct comedi_device *dev,
|
||||||
|
|
Loading…
Add table
Reference in a new issue