kybaaz/linux-xiaomi-chiron
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: comedi: c6xdigio: use comedi_offset_munge()

Browse source 
The value read from the encoders is in two's complement format. Use
the comedi_offset_munge() helper to convert the value to offset binary.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2014-03-10 14:07:39 -07:00 • committed by Greg Kroah-Hartman
parent c034f1f677
commit a7b31d3996
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
drivers/staging/comedi/drivers/c6xdigio.c
View file

@ -153,7 +153,7 @@ static int c6xdigio_encoder_read(struct comedi_device *dev,
c6xdigio_write_data(dev, 0x00, 0x80);
return val ^ 0x800000;
return val;
}
static int c6xdigio_pwm_insn_write(struct comedi_device *dev,
@ -177,12 +177,17 @@ static int c6xdigio_encoder_insn_read(struct comedi_device *dev,
unsigned int *data)
{
unsigned int chan = CR_CHAN(insn->chanspec);
int n;
unsigned int val;
int i;
for (n = 0; n < insn->n; n++)
data[n] = (c6xdigio_encoder_read(dev, chan) & 0xffffff);
for (i = 0; i < insn->n; i++) {
val = c6xdigio_encoder_read(dev, chan);
return n;
/* munge two's complement value to offset binary */
data[i] = comedi_offset_munge(s, val);
}
return insn->n;
}
static void c6xdigio_init(struct comedi_device *dev)