enable GPCTs on all boards

diff --git a/comedi/drivers/ni_atmio.c b/comedi/drivers/ni_atmio.c
index f1408e255cde3cc209d6e86f9966618c490da603..3f7dda5c0c19cc0e924afbf0377926c13c1b2376 100644 (file)
--- a/comedi/drivers/ni_atmio.c
+++ b/comedi/drivers/ni_atmio.c
@@ -99,7 +99,6 @@ static ni_board ni_boards[]={
                ao_fifo_depth:  2048,
                ao_unipolar:    1,
                has_8255:       0,
-               n_gpct:         0,
                caldac:         type1,
        },
        {       device_id:      25,
@@ -115,7 +114,6 @@ static ni_board ni_boards[]={
                ao_fifo_depth:  2048,
                ao_unipolar:    1,
                has_8255:       0,
-               n_gpct:         0,
                caldac:         type1,
        },
        {       device_id:      36,
@@ -131,7 +129,6 @@ static ni_board ni_boards[]={
                ao_fifo_depth:  0,
                ao_unipolar:    1,
                caldac:         type1,
-               n_gpct:         2,
                has_8255:       0,
        },
        {       device_id:      37,
@@ -147,7 +144,6 @@ static ni_board ni_boards[]={
                ao_fifo_depth:  0,
                ao_unipolar:    1,
                caldac:         type1,
-               n_gpct:         0,
                has_8255:       1,
        },
        {       device_id:      38,
@@ -163,7 +159,6 @@ static ni_board ni_boards[]={
                ao_fifo_depth:  2048,
                ao_unipolar:    1,
                has_8255:       0,
-               n_gpct:         0,
                caldac:         type1,
        },
        {       device_id:      39,
@@ -179,7 +174,6 @@ static ni_board ni_boards[]={
                ao_fifo_depth:  0,
                ao_unipolar:    0,
                caldac:         type2,
-               n_gpct:         0,
                has_8255:       0,
        },
        {       device_id:      50,
@@ -195,7 +189,6 @@ static ni_board ni_boards[]={
                ao_fifo_depth:  0,      /* unknown */
                ao_unipolar:    0,      /* unknown */
                caldac:         type2,
-               n_gpct:         0,
                has_8255:       0,
        },
        {       device_id:      51,
@@ -212,7 +205,6 @@ static ni_board ni_boards[]={
                aorangelkup:    0,
                ao_unipolar:    0,
                caldac:         type2,
-               n_gpct:         0,
                has_8255:       0,
        }
 };

diff --git a/comedi/drivers/ni_mio_common.c b/comedi/drivers/ni_mio_common.c
index d1f8cd9e9f511a38c22c9625dbe88a6f28385029..e15f4fc75c9ab6cdacb29a113485d41ad83b9120 100644 (file)
--- a/comedi/drivers/ni_mio_common.c
+++ b/comedi/drivers/ni_mio_common.c
@@ -1667,16 +1667,10 @@ static int ni_E_init(comedi_device *dev,comedi_devconfig *it)
        /* XXX */
        
        /* general purpose counter/timer device */
-       /* CLO */
        s=dev->subdevices+4;
-       if(boardtype.n_gpct){
-           gpct_setup(dev,s);
-           s->type=COMEDI_SUBD_COUNTER;
-           s->trig[0]=ni_gpct;
-       }else{
-           s->type=COMEDI_SUBD_UNUSED;
-           s->trig[0]=NULL;
-       }
+       gpct_setup(dev,s);
+       s->type=COMEDI_SUBD_COUNTER;
+       s->trig[0]=ni_gpct;
        /* XXX */
        
        /* calibration subdevice -- ai and ao */

diff --git a/comedi/drivers/ni_stc.h b/comedi/drivers/ni_stc.h
index f4cb6d2ed1969fd2503c5cc11201aa6aaaa8e832..64a78224084a29438e906881591b66264f79882e 100644 (file)
--- a/comedi/drivers/ni_stc.h
+++ b/comedi/drivers/ni_stc.h
@@ -534,8 +534,6 @@ typedef struct ni_board_struct{
        
        int has_8255;
 
-        int n_gpct;
-
        struct caldac_struct **caldac;
 }ni_board;