lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

staging: comedi: addi-data: remove special handling for apci1710

Browse Source 
Now that the addi_apci_1710 driver is not using addi_common.c we can
remove the CONFIG_APCI_1710 define and all the special handling for
the initialization of it's subdevices.

Also remove the i_ADDIDATA_InsnReadEeprom() function from the
addi_apci_1710 driver. This board does not have an eeprom subdevice
and does not use this function.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten
2012-11-01 11:08:56 -07:00
committed by Greg Kroah-Hartman
parent 10db292fb4
commit c9ab760d63
2 changed files with 137 additions and 315 deletions
Download Patch File Download Diff File Expand all files Collapse all files

279
drivers/staging/comedi/drivers/addi-data/addi_common.c
View File

@@ -212,158 +212,149 @@ static int addi_attach_pci(struct comedi_device *dev,
} }
} }
if (!strcmp(dev->board_name, "apci1710")) { n_subdevices = 7;
#ifdef CONFIG_APCI_1710 ret = comedi_alloc_subdevices(dev, n_subdevices);
i_ADDI_AttachPCI1710(dev); if (ret)
return ret;
/* Allocate and Initialise AI Subdevice Structures */
s = &dev->subdevices[0];
if ((devpriv->s_EeParameters.i_NbrAiChannel)
|| (this_board->i_NbrAiChannelDiff)) {
dev->read_subdev = s;
s->type = COMEDI_SUBD_AI;
s->subdev_flags =
SDF_READABLE | SDF_COMMON | SDF_GROUND
| SDF_DIFF;
if (devpriv->s_EeParameters.i_NbrAiChannel) {
s->n_chan =
devpriv->s_EeParameters.i_NbrAiChannel;
devpriv->b_SingelDiff = 0;
} else {
s->n_chan = this_board->i_NbrAiChannelDiff;
devpriv->b_SingelDiff = 1;
}
s->maxdata = devpriv->s_EeParameters.i_AiMaxdata;
s->len_chanlist = this_board->i_AiChannelList;
s->range_table = this_board->pr_AiRangelist;
/* Set the initialisation flag */
devpriv->b_AiInitialisation = 1;
s->insn_config = this_board->ai_config;
s->insn_read = this_board->ai_read;
s->insn_write = this_board->ai_write;
s->insn_bits = this_board->ai_bits;
s->do_cmdtest = this_board->ai_cmdtest;
s->do_cmd = this_board->ai_cmd;
s->cancel = this_board->ai_cancel;
/* save base address */
devpriv->s_BoardInfos.ui_Address = pci_resource_start(pcidev, 2);
#endif
} else { } else {
n_subdevices = 7; s->type = COMEDI_SUBD_UNUSED;
ret = comedi_alloc_subdevices(dev, n_subdevices); }
if (ret)
return ret;
/* Allocate and Initialise AI Subdevice Structures */ /* Allocate and Initialise AO Subdevice Structures */
s = &dev->subdevices[0]; s = &dev->subdevices[1];
if ((devpriv->s_EeParameters.i_NbrAiChannel) if (devpriv->s_EeParameters.i_NbrAoChannel) {
|| (this_board->i_NbrAiChannelDiff)) { s->type = COMEDI_SUBD_AO;
dev->read_subdev = s; s->subdev_flags = SDF_WRITEABLE | SDF_GROUND | SDF_COMMON;
s->type = COMEDI_SUBD_AI; s->n_chan = devpriv->s_EeParameters.i_NbrAoChannel;
s->subdev_flags = s->maxdata = devpriv->s_EeParameters.i_AoMaxdata;
SDF_READABLE | SDF_COMMON | SDF_GROUND s->len_chanlist =
| SDF_DIFF; devpriv->s_EeParameters.i_NbrAoChannel;
if (devpriv->s_EeParameters.i_NbrAiChannel) { s->range_table = this_board->pr_AoRangelist;
s->n_chan = s->insn_config = this_board->ao_config;
devpriv->s_EeParameters.i_NbrAiChannel; s->insn_write = this_board->ao_write;
devpriv->b_SingelDiff = 0; } else {
} else { s->type = COMEDI_SUBD_UNUSED;
s->n_chan = this_board->i_NbrAiChannelDiff; }
devpriv->b_SingelDiff = 1; /* Allocate and Initialise DI Subdevice Structures */
} s = &dev->subdevices[2];
s->maxdata = devpriv->s_EeParameters.i_AiMaxdata; if (devpriv->s_EeParameters.i_NbrDiChannel) {
s->len_chanlist = this_board->i_AiChannelList; s->type = COMEDI_SUBD_DI;
s->range_table = this_board->pr_AiRangelist; s->subdev_flags = SDF_READABLE | SDF_GROUND | SDF_COMMON;
s->n_chan = devpriv->s_EeParameters.i_NbrDiChannel;
s->maxdata = 1;
s->len_chanlist =
devpriv->s_EeParameters.i_NbrDiChannel;
s->range_table = &range_digital;
s->io_bits = 0; /* all bits input */
s->insn_config = this_board->di_config;
s->insn_read = this_board->di_read;
s->insn_write = this_board->di_write;
s->insn_bits = this_board->di_bits;
} else {
s->type = COMEDI_SUBD_UNUSED;
}
/* Allocate and Initialise DO Subdevice Structures */
s = &dev->subdevices[3];
if (devpriv->s_EeParameters.i_NbrDoChannel) {
s->type = COMEDI_SUBD_DO;
s->subdev_flags =
SDF_READABLE | SDF_WRITEABLE | SDF_GROUND | SDF_COMMON;
s->n_chan = devpriv->s_EeParameters.i_NbrDoChannel;
s->maxdata = devpriv->s_EeParameters.i_DoMaxdata;
s->len_chanlist =
devpriv->s_EeParameters.i_NbrDoChannel;
s->range_table = &range_digital;
s->io_bits = 0xf; /* all bits output */
/* Set the initialisation flag */ /* insn_config - for digital output memory */
devpriv->b_AiInitialisation = 1; s->insn_config = this_board->do_config;
s->insn_write = this_board->do_write;
s->insn_bits = this_board->do_bits;
s->insn_read = this_board->do_read;
} else {
s->type = COMEDI_SUBD_UNUSED;
}
s->insn_config = this_board->ai_config; /* Allocate and Initialise Timer Subdevice Structures */
s->insn_read = this_board->ai_read; s = &dev->subdevices[4];
s->insn_write = this_board->ai_write; if (devpriv->s_EeParameters.i_Timer) {
s->insn_bits = this_board->ai_bits; s->type = COMEDI_SUBD_TIMER;
s->do_cmdtest = this_board->ai_cmdtest; s->subdev_flags = SDF_WRITEABLE | SDF_GROUND | SDF_COMMON;
s->do_cmd = this_board->ai_cmd; s->n_chan = 1;
s->cancel = this_board->ai_cancel; s->maxdata = 0;
s->len_chanlist = 1;
s->range_table = &range_digital;
} else { s->insn_write = this_board->timer_write;
s->type = COMEDI_SUBD_UNUSED; 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;
}
/* Allocate and Initialise AO Subdevice Structures */ /* Allocate and Initialise TTL */
s = &dev->subdevices[1]; s = &dev->subdevices[5];
if (devpriv->s_EeParameters.i_NbrAoChannel) { if (this_board->i_NbrTTLChannel) {
s->type = COMEDI_SUBD_AO; s->type = COMEDI_SUBD_TTLIO;
s->subdev_flags = SDF_WRITEABLE | SDF_GROUND | SDF_COMMON; s->subdev_flags =
s->n_chan = devpriv->s_EeParameters.i_NbrAoChannel; SDF_WRITEABLE | SDF_READABLE | SDF_GROUND | SDF_COMMON;
s->maxdata = devpriv->s_EeParameters.i_AoMaxdata; s->n_chan = this_board->i_NbrTTLChannel;
s->len_chanlist = s->maxdata = 1;
devpriv->s_EeParameters.i_NbrAoChannel; s->io_bits = 0; /* all bits input */
s->range_table = this_board->pr_AoRangelist; s->len_chanlist = this_board->i_NbrTTLChannel;
s->insn_config = this_board->ao_config; s->range_table = &range_digital;
s->insn_write = this_board->ao_write; s->insn_config = this_board->ttl_config;
} else { s->insn_bits = this_board->ttl_bits;
s->type = COMEDI_SUBD_UNUSED; s->insn_read = this_board->ttl_read;
} s->insn_write = this_board->ttl_write;
/* Allocate and Initialise DI Subdevice Structures */ } else {
s = &dev->subdevices[2]; s->type = COMEDI_SUBD_UNUSED;
if (devpriv->s_EeParameters.i_NbrDiChannel) { }
s->type = COMEDI_SUBD_DI;
s->subdev_flags = SDF_READABLE | SDF_GROUND | SDF_COMMON;
s->n_chan = devpriv->s_EeParameters.i_NbrDiChannel;
s->maxdata = 1;
s->len_chanlist =
devpriv->s_EeParameters.i_NbrDiChannel;
s->range_table = &range_digital;
s->io_bits = 0; /* all bits input */
s->insn_config = this_board->di_config;
s->insn_read = this_board->di_read;
s->insn_write = this_board->di_write;
s->insn_bits = this_board->di_bits;
} else {
s->type = COMEDI_SUBD_UNUSED;
}
/* Allocate and Initialise DO Subdevice Structures */
s = &dev->subdevices[3];
if (devpriv->s_EeParameters.i_NbrDoChannel) {
s->type = COMEDI_SUBD_DO;
s->subdev_flags =
SDF_READABLE | SDF_WRITEABLE | SDF_GROUND | SDF_COMMON;
s->n_chan = devpriv->s_EeParameters.i_NbrDoChannel;
s->maxdata = devpriv->s_EeParameters.i_DoMaxdata;
s->len_chanlist =
devpriv->s_EeParameters.i_NbrDoChannel;
s->range_table = &range_digital;
s->io_bits = 0xf; /* all bits output */
/* insn_config - for digital output memory */ /* EEPROM */
s->insn_config = this_board->do_config; s = &dev->subdevices[6];
s->insn_write = this_board->do_write; if (this_board->i_PCIEeprom) {
s->insn_bits = this_board->do_bits; s->type = COMEDI_SUBD_MEMORY;
s->insn_read = this_board->do_read; s->subdev_flags = SDF_READABLE | SDF_INTERNAL;
} else { s->n_chan = 256;
s->type = COMEDI_SUBD_UNUSED; s->maxdata = 0xffff;
} s->insn_read = i_ADDIDATA_InsnReadEeprom;
} else {
/* Allocate and Initialise Timer Subdevice Structures */ s->type = COMEDI_SUBD_UNUSED;
s = &dev->subdevices[4];
if (devpriv->s_EeParameters.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;
}
/* Allocate and Initialise TTL */
s = &dev->subdevices[5];
if (this_board->i_NbrTTLChannel) {
s->type = COMEDI_SUBD_TTLIO;
s->subdev_flags =
SDF_WRITEABLE | SDF_READABLE | SDF_GROUND | SDF_COMMON;
s->n_chan = this_board->i_NbrTTLChannel;
s->maxdata = 1;
s->io_bits = 0; /* all bits input */
s->len_chanlist = this_board->i_NbrTTLChannel;
s->range_table = &range_digital;
s->insn_config = this_board->ttl_config;
s->insn_bits = this_board->ttl_bits;
s->insn_read = this_board->ttl_read;
s->insn_write = this_board->ttl_write;
} else {
s->type = COMEDI_SUBD_UNUSED;
}
/* EEPROM */
s = &dev->subdevices[6];
if (this_board->i_PCIEeprom) {
s->type = COMEDI_SUBD_MEMORY;
s->subdev_flags = SDF_READABLE | SDF_INTERNAL;
s->n_chan = 256;
s->maxdata = 0xffff;
s->insn_read = i_ADDIDATA_InsnReadEeprom;
} else {
s->type = COMEDI_SUBD_UNUSED;
}
} }
i_ADDI_Reset(dev); i_ADDI_Reset(dev);

173
drivers/staging/comedi/drivers/addi_apci_1710.c
View File

@@ -16,8 +16,6 @@ static void fpu_end(void)
kernel_fpu_end(); kernel_fpu_end();
} }
#define CONFIG_APCI_1710 1
#include "addi-data/addi_eeprom.c" #include "addi-data/addi_eeprom.c"
#include "addi-data/hwdrv_APCI1710.c" #include "addi-data/hwdrv_APCI1710.c"
@@ -39,23 +37,6 @@ static const struct addi_board apci1710_boardtypes[] = {
}, },
}; };
static int i_ADDIDATA_InsnReadEeprom(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn,
unsigned int *data)
{
const struct addi_board *this_board = comedi_board(dev);
struct addi_private *devpriv = dev->private;
unsigned short w_Address = CR_CHAN(insn->chanspec);
unsigned short w_Data;
w_Data = addi_eeprom_readw(devpriv->i_IobaseAmcc,
this_board->pc_EepromChip, 2 * w_Address);
data[0] = w_Data;
return insn->n;
}
static irqreturn_t v_ADDI_Interrupt(int irq, void *d) static irqreturn_t v_ADDI_Interrupt(int irq, void *d)
{ {
struct comedi_device *dev = d; struct comedi_device *dev = d;
@@ -209,159 +190,9 @@ static int apci1710_attach_pci(struct comedi_device *dev,
} }
} }
if (!strcmp(dev->board_name, "apci1710")) { i_ADDI_AttachPCI1710(dev);
#ifdef CONFIG_APCI_1710
i_ADDI_AttachPCI1710(dev);
/* save base address */ devpriv->s_BoardInfos.ui_Address = pci_resource_start(pcidev, 2);
devpriv->s_BoardInfos.ui_Address = pci_resource_start(pcidev, 2);
#endif
} else {
n_subdevices = 7;
ret = comedi_alloc_subdevices(dev, n_subdevices);
if (ret)
return ret;
/* Allocate and Initialise AI Subdevice Structures */
s = &dev->subdevices[0];
if ((devpriv->s_EeParameters.i_NbrAiChannel)
|| (this_board->i_NbrAiChannelDiff)) {
dev->read_subdev = s;
s->type = COMEDI_SUBD_AI;
s->subdev_flags =
SDF_READABLE | SDF_COMMON | SDF_GROUND
| SDF_DIFF;
if (devpriv->s_EeParameters.i_NbrAiChannel) {
s->n_chan =
devpriv->s_EeParameters.i_NbrAiChannel;
devpriv->b_SingelDiff = 0;
} else {
s->n_chan = this_board->i_NbrAiChannelDiff;
devpriv->b_SingelDiff = 1;
}
s->maxdata = devpriv->s_EeParameters.i_AiMaxdata;
s->len_chanlist = this_board->i_AiChannelList;
s->range_table = this_board->pr_AiRangelist;
/* Set the initialisation flag */
devpriv->b_AiInitialisation = 1;
s->insn_config = this_board->ai_config;
s->insn_read = this_board->ai_read;
s->insn_write = this_board->ai_write;
s->insn_bits = this_board->ai_bits;
s->do_cmdtest = this_board->ai_cmdtest;
s->do_cmd = this_board->ai_cmd;
s->cancel = this_board->ai_cancel;
} else {
s->type = COMEDI_SUBD_UNUSED;
}
/* Allocate and Initialise AO Subdevice Structures */
s = &dev->subdevices[1];
if (devpriv->s_EeParameters.i_NbrAoChannel) {
s->type = COMEDI_SUBD_AO;
s->subdev_flags = SDF_WRITEABLE | SDF_GROUND | SDF_COMMON;
s->n_chan = devpriv->s_EeParameters.i_NbrAoChannel;
s->maxdata = devpriv->s_EeParameters.i_AoMaxdata;
s->len_chanlist =
devpriv->s_EeParameters.i_NbrAoChannel;
s->range_table = this_board->pr_AoRangelist;
s->insn_config = this_board->ao_config;
s->insn_write = this_board->ao_write;
} else {
s->type = COMEDI_SUBD_UNUSED;
}
/* Allocate and Initialise DI Subdevice Structures */
s = &dev->subdevices[2];
if (devpriv->s_EeParameters.i_NbrDiChannel) {
s->type = COMEDI_SUBD_DI;
s->subdev_flags = SDF_READABLE | SDF_GROUND | SDF_COMMON;
s->n_chan = devpriv->s_EeParameters.i_NbrDiChannel;
s->maxdata = 1;
s->len_chanlist =
devpriv->s_EeParameters.i_NbrDiChannel;
s->range_table = &range_digital;
s->io_bits = 0; /* all bits input */
s->insn_config = this_board->di_config;
s->insn_read = this_board->di_read;
s->insn_write = this_board->di_write;
s->insn_bits = this_board->di_bits;
} else {
s->type = COMEDI_SUBD_UNUSED;
}
/* Allocate and Initialise DO Subdevice Structures */
s = &dev->subdevices[3];
if (devpriv->s_EeParameters.i_NbrDoChannel) {
s->type = COMEDI_SUBD_DO;
s->subdev_flags =
SDF_READABLE | SDF_WRITEABLE | SDF_GROUND | SDF_COMMON;
s->n_chan = devpriv->s_EeParameters.i_NbrDoChannel;
s->maxdata = devpriv->s_EeParameters.i_DoMaxdata;
s->len_chanlist =
devpriv->s_EeParameters.i_NbrDoChannel;
s->range_table = &range_digital;
s->io_bits = 0xf; /* all bits output */
/* insn_config - for digital output memory */
s->insn_config = this_board->do_config;
s->insn_write = this_board->do_write;
s->insn_bits = this_board->do_bits;
s->insn_read = this_board->do_read;
} else {
s->type = COMEDI_SUBD_UNUSED;
}
/* Allocate and Initialise Timer Subdevice Structures */
s = &dev->subdevices[4];
if (devpriv->s_EeParameters.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;
}
/* Allocate and Initialise TTL */
s = &dev->subdevices[5];
if (this_board->i_NbrTTLChannel) {
s->type = COMEDI_SUBD_TTLIO;
s->subdev_flags =
SDF_WRITEABLE | SDF_READABLE | SDF_GROUND | SDF_COMMON;
s->n_chan = this_board->i_NbrTTLChannel;
s->maxdata = 1;
s->io_bits = 0; /* all bits input */
s->len_chanlist = this_board->i_NbrTTLChannel;
s->range_table = &range_digital;
s->insn_config = this_board->ttl_config;
s->insn_bits = this_board->ttl_bits;
s->insn_read = this_board->ttl_read;
s->insn_write = this_board->ttl_write;
} else {
s->type = COMEDI_SUBD_UNUSED;
}
/* EEPROM */
s = &dev->subdevices[6];
if (this_board->i_PCIEeprom) {
s->type = COMEDI_SUBD_MEMORY;
s->subdev_flags = SDF_READABLE | SDF_INTERNAL;
s->n_chan = 256;
s->maxdata = 0xffff;
s->insn_read = i_ADDIDATA_InsnReadEeprom;
} else {
s->type = COMEDI_SUBD_UNUSED;
}
}
i_ADDI_Reset(dev); i_ADDI_Reset(dev);
return 0; return 0;