From: David Schleef <ds@schleef.org>
Date: Thu, 23 Aug 2001 05:47:34 +0000 (+0000)
Subject: Added ni_670x
X-Git-Tag: r0_7_61~155
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=befad7667b6ed05de91485322a95c6d8e8cdad69;p=comedi.git

Added ni_670x
---

diff --git a/Documentation/comedi/drivers.txt b/Documentation/comedi/drivers.txt
index 3cb421cf..85c35e23 100644
--- a/Documentation/comedi/drivers.txt
+++ b/Documentation/comedi/drivers.txt
@@ -554,6 +554,16 @@ Status: works
 
 
 
+Driver: ni_670x.c
+Description: National Instruments 670x
+Author: Bart Joris <bjoris@advalvas.be>
+Updated: Wed, 22 Aug 2001 22:47:32 -0700
+
+The driver currently does not recognize the 6704, because the PCI
+ID is not known.
+
+
+
 Driver: ni_at_a2150.o
 Description: National Instruments AT-A2150
 Author: Frank Mori Hess
diff --git a/comedi/Config.in b/comedi/Config.in
index d16233cd..19345225 100644
--- a/comedi/Config.in
+++ b/comedi/Config.in
@@ -56,10 +56,11 @@ if [ "$CONFIG_COMEDI_NI" = "y" ];then
 	if [ "$CONFIG_PCI" = "y" ];then
 		dep_tristate '  PCI-MIO E series' CONFIG_COMEDI_NI_PCIMIO $CONFIG_COMEDI
 		dep_tristate '  NI PCI-DIO series' CONFIG_COMEDI_NI_PCIDIO $CONFIG_COMEDI
-		if [ "$CONFIG_COMEDI_NI_PCIMIO" = "y" -o "$CONFIG_COMEDI_NI_PCIDIO" = "y" ];then
+		dep_tristate '  NI 670x series' CONFIG_COMEDI_NI_670X $CONFIG_COMEDI
+		if [ "$CONFIG_COMEDI_NI_PCIMIO" = "y" -o "$CONFIG_COMEDI_NI_PCIDIO" = "y" -o "$CONFIG_COMEDI_NI_670X" = "y" ];then
 			define_bool CONFIG_COMEDI_MITE y
 		else
-			if [ "$CONFIG_COMEDI_NI_PCIMIO" = "m" -o "$CONFIG_COMEDI_NI_PCIDIO" = "m" ];then
+			if [ "$CONFIG_COMEDI_NI_PCIMIO" = "m" -o "$CONFIG_COMEDI_NI_PCIDIO" = "m" -o "$CONFIG_COMEDI_NI_670X" = "m" ];then
 				define_bool CONFIG_COMEDI_MITE m
 			fi
 		fi
diff --git a/comedi/drivers/Makefile b/comedi/drivers/Makefile
index ee0fbe8e..c343953f 100644
--- a/comedi/drivers/Makefile
+++ b/comedi/drivers/Makefile
@@ -59,6 +59,7 @@ obj-$(CONFIG_COMEDI_NI_PCIDIO)		+= ni_pcidio.o
 obj-$(CONFIG_COMEDI_MITE)		+= mite.o
 obj-$(CONFIG_COMEDI_NI_ATMIO16D)	+= ni_atmio16d.o
 obj-$(CONFIG_COMEDI_NI_AT_A2150)	+= ni_at_a2150.o
+obj-$(CONFIG_COMEDI_NI_670X)		+= ni_670x.o
 
 obj-$(CONFIG_COMEDI_PCM3730)		+= pcm3730.o
 
diff --git a/comedi/drivers/Makefile.in b/comedi/drivers/Makefile.in
index 17b26285..fe33139b 100644
--- a/comedi/drivers/Makefile.in
+++ b/comedi/drivers/Makefile.in
@@ -26,6 +26,7 @@ select(CONFIG_COMEDI_FL512 fl512.o)
 select(CONFIG_COMEDI_II_PCI20KC ii_pci20kc.o)
 select(CONFIG_COMEDI_MULTIQ3 multiq3.o)
 select(CONFIG_COMEDI_MPC8260CPM mpc8260cpm.o)
+select(CONFIG_COMEDI_NI_ATMIO ni_670x.o)
 select(CONFIG_COMEDI_NI_ATMIO ni_atmio.o)
 select(CONFIG_COMEDI_NI_MIO_CS ni_mio_cs.o)
 select(CONFIG_COMEDI_NI_PCIMIO ni_pcimio.o)