Skip to content

Commit

Permalink
staging: comedi: quatech_daqp_cs: cleanup the comedi_lrange tables
Browse files Browse the repository at this point in the history
For aesthetic reasons, cleanup the whitespace of the range_daqp_ai
table.

Remove the range_daqp_ao table and use the comedi core provided
range table for bipolar 5V (range_bipolar5).

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>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Jan 30, 2013
1 parent 7b947d6 commit e23fe9a
Showing 1 changed file with 8 additions and 14 deletions.
22 changes: 8 additions & 14 deletions drivers/staging/comedi/drivers/quatech_daqp_cs.c
Original file line number Diff line number Diff line change
Expand Up @@ -163,21 +163,15 @@ static struct local_info_t *dev_table[MAX_DEV] = { NULL, /* ... */ };
#define DAQP_AUX_FIFO_NEARFULL 0x02
#define DAQP_AUX_FIFO_EMPTY 0x01

/* These range structures tell COMEDI how the sample values map to
* voltages. The A/D converter has four .ranges = +/- 10V through
* +/- 1.25V, and the D/A converter has only .one = +/- 5V.
*/

static const struct comedi_lrange range_daqp_ai = { 4, {
BIP_RANGE(10),
BIP_RANGE(5),
BIP_RANGE(2.5),
BIP_RANGE(1.25)
}
static const struct comedi_lrange range_daqp_ai = {
4, {
BIP_RANGE(10),
BIP_RANGE(5),
BIP_RANGE(2.5),
BIP_RANGE(1.25)
}
};

static const struct comedi_lrange range_daqp_ao = { 1, {BIP_RANGE(5)} };

/* Cancel a running acquisition */

static int daqp_ai_cancel(struct comedi_device *dev, struct comedi_subdevice *s)
Expand Down Expand Up @@ -797,7 +791,7 @@ static int daqp_attach(struct comedi_device *dev, struct comedi_devconfig *it)
s->n_chan = 2;
s->len_chanlist = 1;
s->maxdata = 0x0fff;
s->range_table = &range_daqp_ao;
s->range_table = &range_bipolar5;
s->insn_write = daqp_ao_insn_write;

s = &dev->subdevices[2];
Expand Down

0 comments on commit e23fe9a

Please sign in to comment.