Add support for the Measurement Computing PCI-DIO96H board to the
generic 8255_pci driver.
Signed-off-by: H Hartley Sweeten <hsweeten@xxxxxxxxxxxxxxxxxxx>
Cc: Ian Abbott <abbotti@xxxxxxxxx>
Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/staging/comedi/Kconfig | 3 ++-
drivers/staging/comedi/drivers/8255_pci.c | 8 ++++++++
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/drivers/staging/comedi/Kconfig b/drivers/staging/comedi/Kconfig
index 1bd7e93..3f67b98 100644
--- a/drivers/staging/comedi/Kconfig
+++ b/drivers/staging/comedi/Kconfig
@@ -558,7 +558,8 @@ config COMEDI_8255_PCI
Supported boards:
ADlink - PCI-7224, PCI-7248, and PCI-7296
- Measurement Computing - PCI-DIO24, PCI-DIO24H and PCI-DIO48H
+ Measurement Computing - PCI-DIO24, PCI-DIO24H, PCI-DIO48H and
+ PCI-DIO96H
To compile this driver as a module, choose M here: the module will
be called 8255_pci.
diff --git a/drivers/staging/comedi/drivers/8255_pci.c b/drivers/staging/comedi/drivers/8255_pci.c
index e011b0a..075f98b 100644
--- a/drivers/staging/comedi/drivers/8255_pci.c
+++ b/drivers/staging/comedi/drivers/8255_pci.c
@@ -34,6 +34,7 @@ Devices: (ADLink) PCI-7224 [adl_pci-7224] - 24 channels
(Measurement Computing) PCI-DIO24 [cb_pci-dio24] - 24 channels
(Measurement Computing) PCI-DIO24H [cb_pci-dio24h] - 24 channels
(Measurement Computing) PCI-DIO48H [cb_pci-dio48h] - 48 channels
+ (Measurement Computing) PCI-DIO96H [cb_pci-dio96h] - 96 channels
Author: H Hartley Sweeten <hsweeten@xxxxxxxxxxxxxxxxxxx>
Updated: Wed, 12 Sep 2012 11:52:01 -0700
Status: untested
@@ -62,6 +63,7 @@ Configuration Options: not applicable, uses PCI auto config
#define PCI_DEVICE_ID_CB_PCIDIO48H 0x000b
#define PCI_DEVICE_ID_CB_PCIDIO24H 0x0014
+#define PCI_DEVICE_ID_CB_PCIDIO96H 0x0017
#define PCI_DEVICE_ID_CB_PCIDIO24 0x0028
struct pci_8255_boardinfo {
@@ -102,6 +104,11 @@ static const struct pci_8255_boardinfo pci_8255_boards[] = {
.device = PCI_DEVICE_ID_CB_PCIDIO48H,
.dio_badr = 1,
.n_8255 = 2,
+ }, {
+ .name = "cb_pci-dio96h",
+ .device = PCI_DEVICE_ID_CB_PCIDIO96H,
+ .dio_badr = 2,
+ .n_8255 = 4,
},
};
@@ -206,6 +213,7 @@ static DEFINE_PCI_DEVICE_TABLE(pci_8255_pci_table) = {
{ PCI_DEVICE(PCI_VENDOR_ID_CB, PCI_DEVICE_ID_CB_PCIDIO24) },
{ PCI_DEVICE(PCI_VENDOR_ID_CB, PCI_DEVICE_ID_CB_PCIDIO24H) },
{ PCI_DEVICE(PCI_VENDOR_ID_CB, PCI_DEVICE_ID_CB_PCIDIO48H) },
+ { PCI_DEVICE(PCI_VENDOR_ID_CB, PCI_DEVICE_ID_CB_PCIDIO96H) },
{ 0 }
};
MODULE_DEVICE_TABLE(pci, pci_8255_pci_table);
--
1.7.11
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
