From cb1898085352e1681a63c94b9b2cfb67c72268c0 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Mon, 4 Feb 2013 16:44:37 -0700 Subject: [PATCH] --- yaml --- r: 354381 b: refs/heads/master c: d35dcc89fc93d8f071fc7f88ae87697a77bb99d0 h: refs/heads/master i: 354379: 6c9fb1c6a7626112793b9a83888303d49910e122 v: v3 --- [refs] | 2 +- .../staging/comedi/drivers/quatech_daqp_cs.c | 27 ++++++++++--------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/[refs] b/[refs] index b6cecbbfae1f..21f72d22bbbc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6a911d8aa54bc79256e766580a19bbd91e76d48f +refs/heads/master: d35dcc89fc93d8f071fc7f88ae87697a77bb99d0 diff --git a/trunk/drivers/staging/comedi/drivers/quatech_daqp_cs.c b/trunk/drivers/staging/comedi/drivers/quatech_daqp_cs.c index f11104252c96..b50ba5466e91 100644 --- a/trunk/drivers/staging/comedi/drivers/quatech_daqp_cs.c +++ b/trunk/drivers/staging/comedi/drivers/quatech_daqp_cs.c @@ -644,31 +644,32 @@ static int daqp_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) return 0; } -/* Single-shot analog output routine */ - static int daqp_ao_insn_write(struct comedi_device *dev, struct comedi_subdevice *s, - struct comedi_insn *insn, unsigned int *data) + struct comedi_insn *insn, + unsigned int *data) { struct daqp_private *devpriv = dev->private; - int d; - unsigned int chan; + unsigned int chan = CR_CHAN(insn->chanspec); + unsigned int val; + int i; if (devpriv->stop) 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 */ 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,