Merged from Comedi

diff --git a/etc/pcmcia/comedi.conf b/etc/pcmcia/comedi.conf
index b86e8813252753238217410c9e67180306155caa..58f3591c8e6b86395def3f8c4d8aabaf02f6df08 100644 (file)
--- 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"
+