|
@@ -29,7 +29,6 @@ static const struct addi_board apci3120_boardtypes[] = {
|
|
|
.i_NbrDiChannel = 4,
|
|
|
.i_NbrDoChannel = 4,
|
|
|
.i_DoMaxdata = 0x0f,
|
|
|
- .i_Timer = 1,
|
|
|
.b_AvailableConvertUnit = 1,
|
|
|
.ui_MinAcquisitiontimeNs = 10000,
|
|
|
.ui_MinDelaytimeNs = 100000,
|
|
@@ -64,7 +63,6 @@ static const struct addi_board apci3120_boardtypes[] = {
|
|
|
.i_NbrDiChannel = 4,
|
|
|
.i_NbrDoChannel = 4,
|
|
|
.i_DoMaxdata = 0x0f,
|
|
|
- .i_Timer = 1,
|
|
|
.b_AvailableConvertUnit = 1,
|
|
|
.ui_MinAcquisitiontimeNs = 10000,
|
|
|
.ui_MinDelaytimeNs = 100000,
|
|
@@ -282,21 +280,17 @@ static int apci3120_attach_pci(struct comedi_device *dev,
|
|
|
|
|
|
/* Allocate and Initialise Timer Subdevice Structures */
|
|
|
s = &dev->subdevices[4];
|
|
|
- if (this_board->i_Timer) {
|
|
|
- s->type = COMEDI_SUBD_TIMER;
|
|
|
- s->subdev_flags = SDF_WRITEABLE | SDF_GROUND | SDF_COMMON;
|
|
|
- s->n_chan = 1;
|
|
|
- s->maxdata = 0;
|
|
|
- s->len_chanlist = 1;
|
|
|
- s->range_table = &range_digital;
|
|
|
-
|
|
|
- s->insn_write = this_board->timer_write;
|
|
|
- s->insn_read = this_board->timer_read;
|
|
|
- s->insn_config = this_board->timer_config;
|
|
|
- s->insn_bits = this_board->timer_bits;
|
|
|
- } else {
|
|
|
- s->type = COMEDI_SUBD_UNUSED;
|
|
|
- }
|
|
|
+ s->type = COMEDI_SUBD_TIMER;
|
|
|
+ s->subdev_flags = SDF_WRITEABLE | SDF_GROUND | SDF_COMMON;
|
|
|
+ s->n_chan = 1;
|
|
|
+ s->maxdata = 0;
|
|
|
+ s->len_chanlist = 1;
|
|
|
+ s->range_table = &range_digital;
|
|
|
+
|
|
|
+ s->insn_write = this_board->timer_write;
|
|
|
+ s->insn_read = this_board->timer_read;
|
|
|
+ s->insn_config = this_board->timer_config;
|
|
|
+ s->insn_bits = this_board->timer_bits;
|
|
|
|
|
|
/* Allocate and Initialise TTL */
|
|
|
s = &dev->subdevices[5];
|