fix caldac type for pci-6036e and pci-6034e. fixed some indentation.

diff --git a/comedi/drivers/ni_pcimio.c b/comedi/drivers/ni_pcimio.c
index c9a3d51ecb801eb3c0c8698187fa47e07ea1cfa1..d8d00803d5f10c219b66ea27c1ba3cce93f5d40e 100644 (file)
--- a/comedi/drivers/ni_pcimio.c
+++ b/comedi/drivers/ni_pcimio.c
@@ -368,7 +368,7 @@ static ni_board ni_boards[]={
                aobits:         0,
                ao_fifo_depth:  0,
                ao_unipolar:    0,
-               caldac:         {mb88341},
+               caldac:         {ad8804_debug},
                has_8255:       0,
        },
        {       device_id:      0x2c80,
@@ -537,37 +537,36 @@ static ni_board ni_boards[]={
                caldac:         {mb88341,mb88341},/* XXX */
        },
 #endif
-        {       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,
+       {       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:         {ad8804_debug},
-                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,
+               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:         {mb88341},
-                has_8255:       0,
-        },
+               has_8255:       0,
+       },
        {       device_id:      0x18c0,
                name:           "pxi-6052e",
                n_adchan:       16,
@@ -582,7 +581,7 @@ static ni_board ni_boards[]={
                ao_fifo_depth:  2048,
                caldac:         {mb88341,mb88341,ad8522},
        },
-       {       device_id:      0x1580,
+       {       device_id:      0x1580,
                name:           "pxi-6031e",
                n_adchan:       64,
                adbits:         16,
@@ -608,7 +607,7 @@ static ni_board ni_boards[]={
                aobits:         16,
                ao_fifo_depth:  0,
                ao_unipolar:    0,
-               caldac:         {mb88341},
+               caldac:         {ad8804_debug},
                has_8255:       0,
        },
 };