From: David Schleef <ds@schleef.org>
Date: Sat, 1 Dec 2001 05:26:50 +0000 (+0000)
Subject: Merged from Comedi
X-Git-Tag: r0_7_18~26
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=61a0154ed80e83a9405fbc4a71023253e02fefa0;p=comedilib.git

Merged from Comedi
---

diff --git a/etc/pcmcia/comedi.conf b/etc/pcmcia/comedi.conf
index b86e881..58f3591 100644
--- a/etc/pcmcia/comedi.conf
+++ b/etc/pcmcia/comedi.conf
@@ -5,6 +5,11 @@ device "ni_mio_cs"
 device "quatech_daqp_cs"
   class "comedi" module "quatech_daqp_cs"
 
+device "das08"
+  class "comedi" module "das08"
+
+device "ni_labpc"
+  class "comedi" module "ni_labpc"
 
 card "National Instruments DAQCard-AI-16XE-50"
 #  version "National Instruments", "*", "DAQCard-AI-16XE-50"
@@ -12,7 +17,7 @@ card "National Instruments DAQCard-AI-16XE-50"
   bind "ni_mio_cs"
 
 card "National Instruments DAQCard-AI-16E-4"
-#  version "National Instruments", "*", "DAQCard-AI-16E-4"
+##  version "National Instruments", "*", "DAQCard-AI-16E-4"
   manfid 0x10b, 0x010c
   bind "ni_mio_cs"
 
@@ -30,3 +35,12 @@ card "Quatech DAQP-308 16-bit Analog Input/Output"
   manfid 0x0137, 0x0027
   bind "quatech_daqp_cs"
 
+#card "Measurement Computing pcm-das08"
+# need to find out id numbers...
+#  manfid 0x0, 0x0
+#  bind "das08"
+
+card "National Instruments DAQCard-1200"
+  manfid 0x10b, 0x161
+  bind "ni_labpc"
+