leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: comedi: quatech_daqp_cs: use (*insn_bits) for digital inputs

Browse Source 
Change the subdevice operation used to read the digital inputs from
a (*insn_read) to a (*insn_bits) function. The (*insn_read) functions
are expected to read 'insn->n' number of samples. The (*insn_bits)
functions just read a single sample (insn->n = 1). Change the return
from '1' to 'insn->n' to clarify what the return is.

Also, set the 'maxdata' for the subdevice. For digital io this value
should be '1' (digital io can only be 1 or 0).

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:
H Hartley Sweeten 2013-02-04 16:43:56 -07:00 committed by Greg Kroah-Hartman
parent 491cc0b042
commit 62100fefbc
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/staging/comedi/drivers/quatech_daqp_cs.c
View File

@ -671,11 +671,10 @@ static int daqp_ao_insn_write(struct comedi_device *dev,
return 1;
}
/* Digital input routine */
static int daqp_di_insn_read(struct comedi_device *dev,
static int daqp_di_insn_bits(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;
@ -684,7 +683,7 @@ static int daqp_di_insn_read(struct comedi_device *dev,
data[0] = inb(dev->iobase + DAQP_DIGITAL_IO);
return 1;
return insn->n;
}
/* Digital output routine */
@ -758,7 +757,8 @@ static int daqp_auto_attach(struct comedi_device *dev,
s->type = COMEDI_SUBD_DI;
s->subdev_flags = SDF_READABLE;
s->n_chan = 1;
s->insn_read = daqp_di_insn_read;
s->maxdata = 1;
s->insn_bits = daqp_di_insn_bits;
s = &dev->subdevices[3];
s->type = COMEDI_SUBD_DO;