added card IDs and descriptions for several PXI cards: PXI-6071, PXI-6070,

PXI-6052, PXI-6040, PXI-6030, PXI-6025

diff --git a/comedi/drivers/ni_pcimio.c b/comedi/drivers/ni_pcimio.c
index 2d1af1d02bafcd95e567d586ebb92c15d702e52e..6c8280da3062ed59d7ec5814cd8e8311fe5cf785 100644 (file)
--- a/comedi/drivers/ni_pcimio.c
+++ b/comedi/drivers/ni_pcimio.c
@@ -121,6 +121,22 @@ static ni_board ni_boards[]={
                caldac:         type2,
                has_8255:       0,
        },
+       {       device_id:      0x11d0,
+               name:           "pxi-6030e",
+               n_adchan:       16,
+               adbits:         16,
+               ai_fifo_depth:  512,
+               alwaysdither:   1,
+               gainlkup:       ai_gain_14,
+               ai_speed:       10000,
+               n_aochan:       2,
+               aobits:         16,
+               ao_fifo_depth:  2048,
+               ao_unipolar:    1,
+               caldac:         type2,
+               has_8255:       0,
+       },
+
        {       device_id:      0x1180,
                name:           "pci-mio-16e-1",
                n_adchan:       16,
@@ -143,7 +159,7 @@ static ni_board ni_boards[]={
                ai_fifo_depth:  512,
                alwaysdither:   0,
                gainlkup:       ai_gain_16,
-               ai_speed:       500,
+               ai_speed:       500, //shouldn't this be 2000?
                n_aochan:       2,
                aobits:         12,
                ao_fifo_depth:  512,
@@ -151,6 +167,22 @@ static ni_board ni_boards[]={
                caldac:         type3,
                has_8255:       0,
        },
+       {       device_id:      0x11c0,
+               name:           "pxi-6040e",
+               n_adchan:       16,
+               adbits:         12,
+               ai_fifo_depth:  512,
+               alwaysdither:   0,
+               gainlkup:       ai_gain_16,
+               ai_speed:       500, //shouldn't this be 2000?
+               n_aochan:       2,
+               aobits:         12,
+               ao_fifo_depth:  512,
+               ao_unipolar:    1,
+               caldac:         type3,
+               has_8255:       0,
+       },
+
        {       device_id:      0x1330,
                name:           "pci-6031e",
                n_adchan:       64,
@@ -255,6 +287,22 @@ static ni_board ni_boards[]={
                caldac:         type3,
                has_8255:       1,
        },
+       {       device_id:      0x2ab0,
+               name:           "pxi-6025e",
+               n_adchan:       16,
+               adbits:         12,
+               ai_fifo_depth:  512,
+               alwaysdither:   0,
+               gainlkup:       ai_gain_4,
+               ai_speed:       5000,
+               n_aochan:       2,
+               aobits:         12,
+               ao_fifo_depth:  0,
+               ao_unipolar:    1,
+               caldac:         type3,
+               has_8255:       1,
+       },
+
        {       device_id:      0x2ca0,
                name:           "pci-6034e",
                n_adchan:       16,
@@ -356,6 +404,56 @@ static ni_board ni_boards[]={
                ao_fifo_depth:  16384,
                caldac:         type4,          /* XXX */
        },
+
+//TIM 5/14/01
+        {       device_id:      0x15b0,
+                name:           "pxi-6071e",
+                n_adchan:       64,
+                adbits:         12,
+                ai_fifo_depth:  512,
+                alwaysdither:   1,
+                gainlkup:       ai_gain_16,
+                ai_speed:       800,
+                n_aochan:       2,
+                aobits:         12,
+                ao_fifo_depth:  2048,
+                ao_unipolar:    1,
+                caldac:         type3,
+                has_8255:       0,
+        },
+
+        {       device_id:      0x11b0,
+                name:           "pxi-6070e",
+                n_adchan:       16,
+                adbits:         12,
+                ai_fifo_depth:  512,
+                alwaysdither:   1,
+                gainlkup:       ai_gain_16,
+                ai_speed:       800,
+                n_aochan:       2,
+                aobits:         12,
+                ao_fifo_depth:  2048,
+                ao_unipolar:    1,
+                caldac:         type3,
+                has_8255:       0,
+        },
+       {       device_id:      0x18c0,
+               name:           "pxi-6052e",
+               n_adchan:       16,
+               adbits:         16,
+               ai_fifo_depth:  512,
+               alwaysdither:   1,
+               gainlkup:       ai_gain_16,
+               ai_speed:       3000,
+               n_aochan:       2,
+               aobits:         16,
+               ao_unipolar:    1,
+               ao_fifo_depth:  2048,
+               caldac:         type4,
+       },
+
+
+
 #if 0
        {       device_id:      0x0000,         /* unknown */
                name:           "pci-6040e",