Skip to content

Commit

Permalink
staging: comedi: addi_apci_1516: add defines for the PCI device ids
Browse files Browse the repository at this point in the history
The PCI device ids supported by this driver are used multiple places
in the code. To improve maintainability, create #define's for them.

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>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Nov 13, 2012
1 parent 42e07ce commit 9138de6
Showing 1 changed file with 13 additions and 6 deletions.
19 changes: 13 additions & 6 deletions drivers/staging/comedi/drivers/addi_apci_1516.c
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,13 @@
#include "../comedidev.h"
#include "comedi_fc.h"

/*
* PCI device ids supported by this driver
*/
#define PCI_DEVICE_ID_APCI1016 0x1000
#define PCI_DEVICE_ID_APCI1516 0x1001
#define PCI_DEVICE_ID_APCI2016 0x1002

/*
* PCI bar 1 I/O Register map
*/
Expand Down Expand Up @@ -60,17 +67,17 @@ struct apci1516_boardinfo {
static const struct apci1516_boardinfo apci1516_boardtypes[] = {
{
.name = "apci1016",
.device = 0x1000,
.device = PCI_DEVICE_ID_APCI1016,
.di_nchan = 16,
}, {
.name = "apci1516",
.device = 0x1001,
.device = PCI_DEVICE_ID_APCI1516,
.di_nchan = 8,
.do_nchan = 8,
.has_timer = 1,
}, {
.name = "apci2016",
.device = 0x1002,
.device = PCI_DEVICE_ID_APCI2016,
.do_nchan = 16,
.has_timer = 1,
},
Expand Down Expand Up @@ -309,9 +316,9 @@ static void __devexit apci1516_pci_remove(struct pci_dev *dev)
}

static DEFINE_PCI_DEVICE_TABLE(apci1516_pci_table) = {
{ PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x1000) },
{ PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x1001) },
{ PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x1002) },
{ PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, PCI_DEVICE_ID_APCI1016) },
{ PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, PCI_DEVICE_ID_APCI1516) },
{ PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, PCI_DEVICE_ID_APCI2016) },
{ 0 }
};
MODULE_DEVICE_TABLE(pci, apci1516_pci_table);
Expand Down

0 comments on commit 9138de6

Please sign in to comment.