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

staging: comedi: ke_counter: fix ke_counter_insn_write()

The comedi core expects the (*insn_write) functions to write insn->n
values. Fix this function to work like the core expects.

The counters are actually 25-bit (24-bits + 1 sign bit). The comedi core
validates that all the data is in range before calling the (*insn_write),
fix the subdevice maxdata so that the sign bit can actually be changed.
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 89d9dcd0
...@@ -54,19 +54,21 @@ static int ke_counter_insn_write(struct comedi_device *dev, ...@@ -54,19 +54,21 @@ static int ke_counter_insn_write(struct comedi_device *dev,
struct comedi_insn *insn, struct comedi_insn *insn,
unsigned int *data) unsigned int *data)
{ {
int chan = CR_CHAN(insn->chanspec); unsigned int chan = CR_CHAN(insn->chanspec);
unsigned int val;
int i;
outb((unsigned char)((data[0] >> 24) & 0xff), for (i = 0; i < insn->n; i++) {
dev->iobase + KE_SIGN_REG(chan)); val = data[0];
outb((unsigned char)((data[0] >> 16) & 0xff),
dev->iobase + KE_MSB_REG(chan));
outb((unsigned char)((data[0] >> 8) & 0xff),
dev->iobase + KE_MID_REG(chan));
outb((unsigned char)((data[0] >> 0) & 0xff),
dev->iobase + KE_LSB_REG(chan));
/* return the number of samples written */ /* Order matters */
return 1; outb((val >> 24) & 0xff, dev->iobase + KE_SIGN_REG(chan));
outb((val >> 16) & 0xff, dev->iobase + KE_MSB_REG(chan));
outb((val >> 8) & 0xff, dev->iobase + KE_MID_REG(chan));
outb((val >> 0) & 0xff, dev->iobase + KE_LSB_REG(chan));
}
return insn->n;
} }
static int ke_counter_insn_read(struct comedi_device *dev, static int ke_counter_insn_read(struct comedi_device *dev,
...@@ -114,7 +116,7 @@ static int cnt_auto_attach(struct comedi_device *dev, ...@@ -114,7 +116,7 @@ static int cnt_auto_attach(struct comedi_device *dev,
s->type = COMEDI_SUBD_COUNTER; s->type = COMEDI_SUBD_COUNTER;
s->subdev_flags = SDF_READABLE; s->subdev_flags = SDF_READABLE;
s->n_chan = 3; s->n_chan = 3;
s->maxdata = 0x00ffffff; s->maxdata = 0x01ffffff;
s->range_table = &range_unknown; s->range_table = &range_unknown;
s->insn_read = ke_counter_insn_read; s->insn_read = ke_counter_insn_read;
s->insn_write = ke_counter_insn_write; s->insn_write = ke_counter_insn_write;
......
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