602x doesn't have unipolar AI.

diff --git a/comedi/drivers/ni_mio_common.c b/comedi/drivers/ni_mio_common.c
index 2011b172d2a8763e024ce0a48abff62684aebed5..c5966f71ad4d597abbe02b981b362e9a3ce7ad7a 100644 (file)
--- a/comedi/drivers/ni_mio_common.c
+++ b/comedi/drivers/ni_mio_common.c
@@ -120,17 +120,7 @@ static comedi_lrange range_ni_E_ai_limited14={     14, {
        RANGE( 0,       0.2     ),
        RANGE( 0,       0.1     ),
 }};
-static comedi_lrange range_ni_E_ai_limited_602x={ 8, {
-       RANGE( -10,     10      ),
-       RANGE( -5,      5       ),
-       RANGE( -0.5,    0.5     ),
-       RANGE( -0.05,   0.05    ),
-       RANGE( 0,       20      ),
-       RANGE( 0,       10      ),
-       RANGE( 0,       1       ),
-       RANGE( 0,       0.1     ),
-}};
-static comedi_lrange range_ni_E_ai_603x={ 4, {
+static comedi_lrange range_ni_E_ai_bipolar4={ 4, {
        RANGE( -10,     10      ),
        RANGE( -5,      5       ),
        RANGE( -0.5,    0.5     ),
@@ -153,8 +143,7 @@ static comedi_lrange *ni_range_lkup[]={
        &range_ni_E_ai,
        &range_ni_E_ai_limited,
        &range_ni_E_ai_limited14,
-       &range_ni_E_ai_limited_602x,
-       &range_ni_E_ai_603x,
+       &range_ni_E_ai_bipolar4,
 };
 
 

diff --git a/comedi/drivers/ni_pcimio.c b/comedi/drivers/ni_pcimio.c
index 6de1defa947e816628858f8c8fda4647d1715fc7..2d1af1d02bafcd95e567d586ebb92c15d702e52e 100644 (file)
--- a/comedi/drivers/ni_pcimio.c
+++ b/comedi/drivers/ni_pcimio.c
@@ -217,7 +217,7 @@ static ni_board ni_boards[]={
                adbits:         12,
                ai_fifo_depth:  512,
                alwaysdither:   0,
-               gainlkup:       ai_gain_8_602x,
+               gainlkup:       ai_gain_4,
                ai_speed:       5000,
                n_aochan:       0,
                aobits:         0,
@@ -231,7 +231,7 @@ static ni_board ni_boards[]={
                adbits:         12,
                ai_fifo_depth:  512,
                alwaysdither:   0,
-               gainlkup:       ai_gain_8_602x,
+               gainlkup:       ai_gain_4,
                ai_speed:       5000,
                n_aochan:       2,
                aobits:         12,
@@ -246,7 +246,7 @@ static ni_board ni_boards[]={
                adbits:         12,
                ai_fifo_depth:  512,
                alwaysdither:   0,
-               gainlkup:       ai_gain_8_602x,
+               gainlkup:       ai_gain_4,
                ai_speed:       5000,
                n_aochan:       2,
                aobits:         12,
@@ -261,7 +261,7 @@ static ni_board ni_boards[]={
                adbits:         16,
                ai_fifo_depth:  512,
                alwaysdither:   1,
-               gainlkup:       ai_gain_4_603x,
+               gainlkup:       ai_gain_4,
                ai_speed:       5000,
                n_aochan:       0,
                aobits:         0,
@@ -276,7 +276,7 @@ static ni_board ni_boards[]={
                adbits:         16,
                ai_fifo_depth:  512,
                alwaysdither:   1,
-               gainlkup:       ai_gain_4_603x,
+               gainlkup:       ai_gain_4,
                ai_speed:       5000,
                n_aochan:       2,
                aobits:         12,

diff --git a/comedi/drivers/ni_stc.h b/comedi/drivers/ni_stc.h
index 3a920ffe35c5884fd2559b7df27cdad340fa1ecc..0725a0292128494945268b95dac94f13fedf4e28 100644 (file)
--- a/comedi/drivers/ni_stc.h
+++ b/comedi/drivers/ni_stc.h
@@ -551,7 +551,7 @@
        but I thought I'd put it here anyway.
 */
 
-enum{ ai_gain_16=0, ai_gain_8, ai_gain_14, ai_gain_8_602x, ai_gain_4_603x };
+enum{ ai_gain_16=0, ai_gain_8, ai_gain_14, ai_gain_4 };
 extern struct caldac_struct caldac_mb88341,
        caldac_dac8800,
        caldac_dac8043,