---

yaml --- r: 354236 b: refs/heads/master c: e23fe9a h: refs/heads/master v: v3
git-mirror · Jan 30, 2013 · feca577 · feca577
1 parent dd63a8b
commit feca577
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 15 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7b947d6116d6408afe7ffaa176e634c715cef9b9
+refs/heads/master: e23fe9a1bf80eee77d4cc97504bcec0c40ed973d
diff --git a/trunk/drivers/staging/comedi/drivers/quatech_daqp_cs.c b/trunk/drivers/staging/comedi/drivers/quatech_daqp_cs.c
@@ -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)
@@ -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];