---

yaml --- r: 337499 b: refs/heads/master c: 4ebd304 h: refs/heads/master i: 337497: 1a74346 337495: ae6dc23 v: v3
git-mirror · Oct 31, 2012 · 6b9189e · 6b9189e
1 parent 94c0ff3
commit 6b9189e
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 50 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c919d71c7e3cd4573c6d4c49806105513492400f
+refs/heads/master: 4ebd3047461cd547a1c654be04b91c0495b82677
diff --git a/trunk/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.c b/trunk/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.c
@@ -44,7 +44,40 @@ You should also find the complete GPL in the COPYING file accompanying this sour
   +----------+-----------+------------------------------------------------+
 */
 
-#include "hwdrv_apci3xxx.h"
+#ifndef COMEDI_SUBD_TTLIO
+#define COMEDI_SUBD_TTLIO	11	/* Digital Input Output But TTL */
+#endif
+
+#ifndef ADDIDATA_ENABLE
+#define ADDIDATA_ENABLE				1
+#define ADDIDATA_DISABLE			0
+#endif
+
+#define APCI3XXX_SINGLE				0
+#define APCI3XXX_DIFF				1
+#define APCI3XXX_CONFIGURATION			0
+
+#define APCI3XXX_TTL_INIT_DIRECTION_PORT2	0
+
+static const struct comedi_lrange range_apci3XXX_ai = {
+	8, {
+		BIP_RANGE(10),
+		BIP_RANGE(5),
+		BIP_RANGE(2),
+		BIP_RANGE(1),
+		UNI_RANGE(10),
+		UNI_RANGE(5),
+		UNI_RANGE(2),
+		UNI_RANGE(1)
+	}
+};
+
+static const struct comedi_lrange range_apci3XXX_ao = {
+	2, {
+		BIP_RANGE(10),
+		UNI_RANGE(10)
+	}
+};
 
 /*
 +----------------------------------------------------------------------------+

diff --git a/trunk/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.h b/trunk/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.h