Skip to content

L
linux
Commit 8c287d20 authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman
Browse files
Options

staging: comedi: amplc_dio200: separately configure ISA and PCI 

The amplc_dio200 driver supports both ISA and PCI cards, but currently
it is only possible to select the driver if PCI is configured.  This
patch splits the configuration to make the ISA and PCI parts seperately
selectable, and changes the driver to only include the selected ISA
and/or PCI board types.
Signed-off-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ac1a4f2c
Hide whitespace changes
Inline Side-by-side
Showing with 74 additions and 28 deletions
drivers/staging/comedi/Kconfig
View file @ 8c287d20
...@@ -211,6 +211,18 @@ config COMEDI_PCM3730 ...@@ -211,6 +211,18 @@ config COMEDI_PCM3730
To compile this driver as a module, choose M here: the module will be To compile this driver as a module, choose M here: the module will be
called pcm3730. called pcm3730.
config COMEDI_AMPLC_DIO200_ISA
tristate "Amplicon PC212E/PC214E/PC215E/PC218E/PC272E"
select COMEDI_AMPLC_DIO200
depends on COMEDI_ISA_DRIVERS
default N
---help---
Enable support for Amplicon PC212E, PC214E, PC215E, PC218E and
PC272E ISA DIO boards
To compile this driver as a module, choose M here: the module will be
called amplc_dio200.
config COMEDI_RTI800 config COMEDI_RTI800
tristate "Analog Devices RTI-800/815 ISA card support" tristate "Analog Devices RTI-800/815 ISA card support"
default N default N
...@@ -772,12 +784,12 @@ config COMEDI_ADV_PCI_DIO ...@@ -772,12 +784,12 @@ config COMEDI_ADV_PCI_DIO
To compile this driver as a module, choose M here: the module will be To compile this driver as a module, choose M here: the module will be
called adv_pci_dio. called adv_pci_dio.
config COMEDI_AMPLC_DIO200 config COMEDI_AMPLC_DIO200_PCI
tristate "Amplicon PC272E and PCI272 DIO board support" tristate "Amplicon PCI215 and PCI272 DIO board support"
select COMEDI_8255 select COMEDI_AMPLC_DIO200
default N default N
---help--- ---help---
Enable support for Amplicon PC272E and PCI272 DIO boards Enable support for Amplicon PCI215 and PCI272 DIO boards.
To compile this driver as a module, choose M here: the module will be To compile this driver as a module, choose M here: the module will be
called amplc_dio200. called amplc_dio200.
...@@ -1382,3 +1394,8 @@ config COMEDI_FC ...@@ -1382,3 +1394,8 @@ config COMEDI_FC
To compile this driver as a module, choose M here: the module will be To compile this driver as a module, choose M here: the module will be
called comedi_fc. called comedi_fc.
config COMEDI_AMPLC_DIO200
def_tristate N
depends on COMEDI
select COMEDI_8255
drivers/staging/comedi/drivers/amplc_dio200.c
View file @ 8c287d20
...@@ -217,6 +217,14 @@ order they appear in the channel list. ...@@ -217,6 +217,14 @@ order they appear in the channel list.
#define DIO200_DRIVER_NAME "amplc_dio200" #define DIO200_DRIVER_NAME "amplc_dio200"
#ifdef CONFIG_COMEDI_AMPLC_DIO200_ISA_MODULE
#define CONFIG_COMEDI_AMPLC_DIO200_ISA
#endif
#ifdef CONFIG_COMEDI_AMPLC_DIO200_PCI_MODULE
#define CONFIG_COMEDI_AMPLC_DIO200_PCI
#endif
/* PCI IDs */ /* PCI IDs */
#define PCI_VENDOR_ID_AMPLICON 0x14dc #define PCI_VENDOR_ID_AMPLICON 0x14dc
#define PCI_DEVICE_ID_AMPLICON_PCI272 0x000a #define PCI_DEVICE_ID_AMPLICON_PCI272 0x000a
...@@ -274,10 +282,14 @@ enum dio200_model { ...@@ -274,10 +282,14 @@ enum dio200_model {
}; };
enum dio200_layout { enum dio200_layout {
#ifdef CONFIG_COMEDI_AMPLC_DIO200_ISA
pc212_layout, pc212_layout,
pc214_layout, pc214_layout,
#endif
pc215_layout, pc215_layout,
#ifdef CONFIG_COMEDI_AMPLC_DIO200_ISA
pc218_layout, pc218_layout,
#endif
pc272_layout pc272_layout
}; };
...@@ -290,6 +302,7 @@ struct dio200_board { ...@@ -290,6 +302,7 @@ struct dio200_board {
}; };
static const struct dio200_board dio200_boards[] = { static const struct dio200_board dio200_boards[] = {
#ifdef CONFIG_COMEDI_AMPLC_DIO200_ISA
{ {
.name = "pc212e", .name = "pc212e",
.bustype = isa_bustype, .bustype = isa_bustype,
...@@ -308,15 +321,6 @@ static const struct dio200_board dio200_boards[] = { ...@@ -308,15 +321,6 @@ static const struct dio200_board dio200_boards[] = {
.model = pc215e_model, .model = pc215e_model,
.layout = pc215_layout, .layout = pc215_layout,
}, },
#ifdef CONFIG_COMEDI_PCI
{
.name = "pci215",
.devid = PCI_DEVICE_ID_AMPLICON_PCI215,
.bustype = pci_bustype,
.model = pci215_model,
.layout = pc215_layout,
},
#endif
{ {
.name = "pc218e", .name = "pc218e",
.bustype = isa_bustype, .bustype = isa_bustype,
...@@ -329,7 +333,15 @@ static const struct dio200_board dio200_boards[] = { ...@@ -329,7 +333,15 @@ static const struct dio200_board dio200_boards[] = {
.model = pc272e_model, .model = pc272e_model,
.layout = pc272_layout, .layout = pc272_layout,
}, },
#ifdef CONFIG_COMEDI_PCI #endif
#ifdef CONFIG_COMEDI_AMPLC_DIO200_PCI
{
.name = "pci215",
.devid = PCI_DEVICE_ID_AMPLICON_PCI215,
.bustype = pci_bustype,
.model = pci215_model,
.layout = pc215_layout,
},
{ {
.name = "pci272", .name = "pci272",
.devid = PCI_DEVICE_ID_AMPLICON_PCI272, .devid = PCI_DEVICE_ID_AMPLICON_PCI272,
...@@ -337,8 +349,6 @@ static const struct dio200_board dio200_boards[] = { ...@@ -337,8 +349,6 @@ static const struct dio200_board dio200_boards[] = {
.model = pci272_model, .model = pci272_model,
.layout = pc272_layout, .layout = pc272_layout,
}, },
#endif
#ifdef CONFIG_COMEDI_PCI
{ {
.name = DIO200_DRIVER_NAME, .name = DIO200_DRIVER_NAME,
.devid = PCI_DEVICE_ID_INVALID, .devid = PCI_DEVICE_ID_INVALID,
...@@ -367,6 +377,7 @@ struct dio200_layout_struct { ...@@ -367,6 +377,7 @@ struct dio200_layout_struct {
}; };
static const struct dio200_layout_struct dio200_layouts[] = { static const struct dio200_layout_struct dio200_layouts[] = {
#ifdef CONFIG_COMEDI_AMPLC_DIO200_ISA
[pc212_layout] = { [pc212_layout] = {
.n_subdevs = 6, .n_subdevs = 6,
.sdtype = {sd_8255, sd_8254, sd_8254, sd_8254, .sdtype = {sd_8255, sd_8254, sd_8254, sd_8254,
...@@ -385,6 +396,7 @@ static const struct dio200_layout_struct dio200_layouts[] = { ...@@ -385,6 +396,7 @@ static const struct dio200_layout_struct dio200_layouts[] = {
.has_int_sce = 0, .has_int_sce = 0,
.has_clk_gat_sce = 0, .has_clk_gat_sce = 0,
}, },
#endif
[pc215_layout] = { [pc215_layout] = {
.n_subdevs = 5, .n_subdevs = 5,
.sdtype = {sd_8255, sd_8255, sd_8254, .sdtype = {sd_8255, sd_8255, sd_8254,
...@@ -394,6 +406,7 @@ static const struct dio200_layout_struct dio200_layouts[] = { ...@@ -394,6 +406,7 @@ static const struct dio200_layout_struct dio200_layouts[] = {
.has_int_sce = 1, .has_int_sce = 1,
.has_clk_gat_sce = 1, .has_clk_gat_sce = 1,
}, },
#ifdef CONFIG_COMEDI_AMPLC_DIO200_ISA
[pc218_layout] = { [pc218_layout] = {
.n_subdevs = 7, .n_subdevs = 7,
.sdtype = {sd_8254, sd_8254, sd_8255, sd_8254, .sdtype = {sd_8254, sd_8254, sd_8255, sd_8254,
...@@ -405,6 +418,7 @@ static const struct dio200_layout_struct dio200_layouts[] = { ...@@ -405,6 +418,7 @@ static const struct dio200_layout_struct dio200_layouts[] = {
.has_int_sce = 1, .has_int_sce = 1,
.has_clk_gat_sce = 1, .has_clk_gat_sce = 1,
}, },
#endif
[pc272_layout] = { [pc272_layout] = {
.n_subdevs = 4, .n_subdevs = 4,
.sdtype = {sd_8255, sd_8255, sd_8255, .sdtype = {sd_8255, sd_8255, sd_8255,
...@@ -419,7 +433,7 @@ static const struct dio200_layout_struct dio200_layouts[] = { ...@@ -419,7 +433,7 @@ static const struct dio200_layout_struct dio200_layouts[] = {
* PCI driver table. * PCI driver table.
*/ */
#ifdef CONFIG_COMEDI_PCI #ifdef CONFIG_COMEDI_AMPLC_DIO200_PCI
static DEFINE_PCI_DEVICE_TABLE(dio200_pci_table) = { static DEFINE_PCI_DEVICE_TABLE(dio200_pci_table) = {
{ PCI_DEVICE(PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_AMPLICON_PCI215) }, { PCI_DEVICE(PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_AMPLICON_PCI215) },
{ PCI_DEVICE(PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_AMPLICON_PCI272) }, { PCI_DEVICE(PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_AMPLICON_PCI272) },
...@@ -427,7 +441,7 @@ static DEFINE_PCI_DEVICE_TABLE(dio200_pci_table) = { ...@@ -427,7 +441,7 @@ static DEFINE_PCI_DEVICE_TABLE(dio200_pci_table) = {
}; };
MODULE_DEVICE_TABLE(pci, dio200_pci_table); MODULE_DEVICE_TABLE(pci, dio200_pci_table);
#endif /* CONFIG_COMEDI_PCI */ #endif /* CONFIG_COMEDI_AMPLC_DIO200_PCI */
/* /*
* Useful for shorthand access to the particular board structure * Useful for shorthand access to the particular board structure
...@@ -441,7 +455,7 @@ MODULE_DEVICE_TABLE(pci, dio200_pci_table); ...@@ -441,7 +455,7 @@ MODULE_DEVICE_TABLE(pci, dio200_pci_table);
feel free to suggest moving the variable to the struct comedi_device struct. feel free to suggest moving the variable to the struct comedi_device struct.
*/ */
struct dio200_private { struct dio200_private {
#ifdef CONFIG_COMEDI_PCI #ifdef CONFIG_COMEDI_AMPLC_DIO200_PCI
struct pci_dev *pci_dev; /* PCI device */ struct pci_dev *pci_dev; /* PCI device */
#endif #endif
int intr_sd; int intr_sd;
...@@ -490,7 +504,7 @@ static struct comedi_driver driver_amplc_dio200 = { ...@@ -490,7 +504,7 @@ static struct comedi_driver driver_amplc_dio200 = {
.num_names = ARRAY_SIZE(dio200_boards), .num_names = ARRAY_SIZE(dio200_boards),
}; };
#ifdef CONFIG_COMEDI_PCI #ifdef CONFIG_COMEDI_AMPLC_DIO200_PCI
static int __devinit driver_amplc_dio200_pci_probe(struct pci_dev *dev, static int __devinit driver_amplc_dio200_pci_probe(struct pci_dev *dev,
const struct pci_device_id const struct pci_device_id
*ent) *ent)
...@@ -549,7 +563,7 @@ module_exit(driver_amplc_dio200_cleanup_module); ...@@ -549,7 +563,7 @@ module_exit(driver_amplc_dio200_cleanup_module);
* This function looks for a PCI device matching the requested board name, * This function looks for a PCI device matching the requested board name,
* bus and slot. * bus and slot.
*/ */
#ifdef CONFIG_COMEDI_PCI #ifdef CONFIG_COMEDI_AMPLC_DIO200_PCI
static int static int
dio200_find_pci(struct comedi_device *dev, int bus, int slot, dio200_find_pci(struct comedi_device *dev, int bus, int slot,
struct pci_dev **pci_dev_p) struct pci_dev **pci_dev_p)
...@@ -611,6 +625,7 @@ dio200_find_pci(struct comedi_device *dev, int bus, int slot, ...@@ -611,6 +625,7 @@ dio200_find_pci(struct comedi_device *dev, int bus, int slot,
* This function checks and requests an I/O region, reporting an error * This function checks and requests an I/O region, reporting an error
* if there is a conflict. * if there is a conflict.
*/ */
#ifdef CONFIG_COMEDI_AMPLC_DIO200_ISA
static int static int
dio200_request_region(unsigned minor, unsigned long from, unsigned long extent) dio200_request_region(unsigned minor, unsigned long from, unsigned long extent)
{ {
...@@ -621,6 +636,7 @@ dio200_request_region(unsigned minor, unsigned long from, unsigned long extent) ...@@ -621,6 +636,7 @@ dio200_request_region(unsigned minor, unsigned long from, unsigned long extent)
} }
return 0; return 0;
} }
#endif
/* /*
* 'insn_bits' function for an 'INTERRUPT' subdevice. * 'insn_bits' function for an 'INTERRUPT' subdevice.
...@@ -1332,7 +1348,7 @@ static int dio200_attach(struct comedi_device *dev, struct comedi_devconfig *it) ...@@ -1332,7 +1348,7 @@ static int dio200_attach(struct comedi_device *dev, struct comedi_devconfig *it)
struct comedi_subdevice *s; struct comedi_subdevice *s;
unsigned long iobase = 0; unsigned long iobase = 0;
unsigned int irq = 0; unsigned int irq = 0;
#ifdef CONFIG_COMEDI_PCI #ifdef CONFIG_COMEDI_AMPLC_DIO200_PCI
struct pci_dev *pci_dev = NULL; struct pci_dev *pci_dev = NULL;
int bus = 0, slot = 0; int bus = 0, slot = 0;
#endif #endif
...@@ -1354,12 +1370,14 @@ static int dio200_attach(struct comedi_device *dev, struct comedi_devconfig *it) ...@@ -1354,12 +1370,14 @@ static int dio200_attach(struct comedi_device *dev, struct comedi_devconfig *it)
/* Process options. */ /* Process options. */
switch (thisboard->bustype) { switch (thisboard->bustype) {
#ifdef CONFIG_COMEDI_AMPLC_DIO200_ISA
case isa_bustype: case isa_bustype:
iobase = it->options[0]; iobase = it->options[0];
irq = it->options[1]; irq = it->options[1];
share_irq = 0; share_irq = 0;
break; break;
#ifdef CONFIG_COMEDI_PCI #endif
#ifdef CONFIG_COMEDI_AMPLC_DIO200_PCI
case pci_bustype: case pci_bustype:
bus = it->options[0]; bus = it->options[0];
slot = it->options[1]; slot = it->options[1];
...@@ -1382,7 +1400,7 @@ static int dio200_attach(struct comedi_device *dev, struct comedi_devconfig *it) ...@@ -1382,7 +1400,7 @@ static int dio200_attach(struct comedi_device *dev, struct comedi_devconfig *it)
devpriv->intr_sd = -1; devpriv->intr_sd = -1;
/* Enable device and reserve I/O spaces. */ /* Enable device and reserve I/O spaces. */
#ifdef CONFIG_COMEDI_PCI #ifdef CONFIG_COMEDI_AMPLC_DIO200_PCI
if (pci_dev) { if (pci_dev) {
ret = comedi_pci_enable(pci_dev, DIO200_DRIVER_NAME); ret = comedi_pci_enable(pci_dev, DIO200_DRIVER_NAME);
if (ret < 0) { if (ret < 0) {
...@@ -1396,9 +1414,11 @@ static int dio200_attach(struct comedi_device *dev, struct comedi_devconfig *it) ...@@ -1396,9 +1414,11 @@ static int dio200_attach(struct comedi_device *dev, struct comedi_devconfig *it)
} else } else
#endif #endif
{ {
#ifdef CONFIG_COMEDI_AMPLC_DIO200_ISA
ret = dio200_request_region(dev->minor, iobase, DIO200_IO_SIZE); ret = dio200_request_region(dev->minor, iobase, DIO200_IO_SIZE);
if (ret < 0) if (ret < 0)
return ret; return ret;
#endif
} }
dev->iobase = iobase; dev->iobase = iobase;
...@@ -1474,12 +1494,19 @@ static int dio200_attach(struct comedi_device *dev, struct comedi_devconfig *it) ...@@ -1474,12 +1494,19 @@ static int dio200_attach(struct comedi_device *dev, struct comedi_devconfig *it)
} }
printk(KERN_INFO "comedi%d: %s ", dev->minor, dev->board_name); printk(KERN_INFO "comedi%d: %s ", dev->minor, dev->board_name);
if (thisboard->bustype == isa_bustype) { switch (thisboard->bustype) {
#ifdef CONFIG_COMEDI_AMPLC_DIO200_ISA
case isa_bustype:
printk("(base %#lx) ", iobase); printk("(base %#lx) ", iobase);
} else { break;
#ifdef CONFIG_COMEDI_PCI #endif
#ifdef CONFIG_COMEDI_AMPLC_DIO200_PCI
case pci_bustype:
printk("(pci %s) ", pci_name(pci_dev)); printk("(pci %s) ", pci_name(pci_dev));
break;
#endif #endif
default:
break;
} }
if (irq) if (irq)
printk("(irq %u%s) ", irq, (dev->irq ? "" : " UNAVAILABLE")); printk("(irq %u%s) ", irq, (dev->irq ? "" : " UNAVAILABLE"));
...@@ -1529,7 +1556,7 @@ static int dio200_detach(struct comedi_device *dev) ...@@ -1529,7 +1556,7 @@ static int dio200_detach(struct comedi_device *dev)
} }
} }
if (devpriv) { if (devpriv) {
#ifdef CONFIG_COMEDI_PCI #ifdef CONFIG_COMEDI_AMPLC_DIO200_PCI
if (devpriv->pci_dev) { if (devpriv->pci_dev) {
if (dev->iobase) if (dev->iobase)
comedi_pci_disable(devpriv->pci_dev); comedi_pci_disable(devpriv->pci_dev);
...@@ -1537,8 +1564,10 @@ static int dio200_detach(struct comedi_device *dev) ...@@ -1537,8 +1564,10 @@ static int dio200_detach(struct comedi_device *dev)
} else } else
#endif #endif
{ {
#ifdef CONFIG_COMEDI_AMPLC_DIO200_ISA
if (dev->iobase) if (dev->iobase)
release_region(dev->iobase, DIO200_IO_SIZE); release_region(dev->iobase, DIO200_IO_SIZE);
#endif
} }
} }
if (dev->board_name) if (dev->board_name)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7