Commit 2847ff5d authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: comedidev.h: add PCI_VENDOR_ID_AMPLICON

Add a define for the Amplicon Liveline Limited PCI vendor id.
Remove the duplicates in the drivers.
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 00f5c774
...@@ -68,6 +68,7 @@ ...@@ -68,6 +68,7 @@
#define PCI_VENDOR_ID_MEILHAUS 0x1402 #define PCI_VENDOR_ID_MEILHAUS 0x1402
#define PCI_VENDOR_ID_RTD 0x1435 #define PCI_VENDOR_ID_RTD 0x1435
#define PCI_VENDOR_ID_ADLINK 0x144a #define PCI_VENDOR_ID_ADLINK 0x144a
#define PCI_VENDOR_ID_AMPLICON 0x14dc
#define COMEDI_NUM_MINORS 0x100 #define COMEDI_NUM_MINORS 0x100
#define COMEDI_NUM_BOARD_MINORS 0x30 #define COMEDI_NUM_BOARD_MINORS 0x30
......
...@@ -272,7 +272,6 @@ ...@@ -272,7 +272,6 @@
#define DO_PCI IS_ENABLED(CONFIG_COMEDI_AMPLC_DIO200_PCI) #define DO_PCI IS_ENABLED(CONFIG_COMEDI_AMPLC_DIO200_PCI)
/* PCI IDs */ /* PCI IDs */
#define PCI_VENDOR_ID_AMPLICON 0x14dc
#define PCI_DEVICE_ID_AMPLICON_PCI272 0x000a #define PCI_DEVICE_ID_AMPLICON_PCI272 0x000a
#define PCI_DEVICE_ID_AMPLICON_PCI215 0x000b #define PCI_DEVICE_ID_AMPLICON_PCI215 0x000b
#define PCI_DEVICE_ID_AMPLICON_PCIE236 0x0011 #define PCI_DEVICE_ID_AMPLICON_PCIE236 0x0011
......
...@@ -66,7 +66,6 @@ unused. ...@@ -66,7 +66,6 @@ unused.
#define DO_PCI IS_ENABLED(CONFIG_COMEDI_AMPLC_PC236_PCI) #define DO_PCI IS_ENABLED(CONFIG_COMEDI_AMPLC_PC236_PCI)
/* PCI236 PCI configuration register information */ /* PCI236 PCI configuration register information */
#define PCI_VENDOR_ID_AMPLICON 0x14dc
#define PCI_DEVICE_ID_AMPLICON_PCI236 0x0009 #define PCI_DEVICE_ID_AMPLICON_PCI236 0x0009
#define PCI_DEVICE_ID_INVALID 0xffff #define PCI_DEVICE_ID_INVALID 0xffff
......
...@@ -52,7 +52,6 @@ The state of the outputs can be read. ...@@ -52,7 +52,6 @@ The state of the outputs can be read.
#define DO_PCI IS_ENABLED(CONFIG_COMEDI_AMPLC_PC263_PCI) #define DO_PCI IS_ENABLED(CONFIG_COMEDI_AMPLC_PC263_PCI)
/* PCI263 PCI configuration register information */ /* PCI263 PCI configuration register information */
#define PCI_VENDOR_ID_AMPLICON 0x14dc
#define PCI_DEVICE_ID_AMPLICON_PCI263 0x000c #define PCI_DEVICE_ID_AMPLICON_PCI263 0x000c
#define PCI_DEVICE_ID_INVALID 0xffff #define PCI_DEVICE_ID_INVALID 0xffff
......
...@@ -116,7 +116,6 @@ Passing a zero for an option is the same as leaving it unspecified. ...@@ -116,7 +116,6 @@ Passing a zero for an option is the same as leaving it unspecified.
/* /*
* PCI IDs. * PCI IDs.
*/ */
#define PCI_VENDOR_ID_AMPLICON 0x14dc
#define PCI_DEVICE_ID_AMPLICON_PCI224 0x0007 #define PCI_DEVICE_ID_AMPLICON_PCI224 0x0007
#define PCI_DEVICE_ID_AMPLICON_PCI234 0x0008 #define PCI_DEVICE_ID_AMPLICON_PCI234 0x0008
#define PCI_DEVICE_ID_INVALID 0xffff #define PCI_DEVICE_ID_INVALID 0xffff
......
...@@ -198,7 +198,6 @@ for (or detection of) various hardware problems added by Ian Abbott. ...@@ -198,7 +198,6 @@ for (or detection of) various hardware problems added by Ian Abbott.
#include "8255.h" #include "8255.h"
/* PCI230 PCI configuration register information */ /* PCI230 PCI configuration register information */
#define PCI_VENDOR_ID_AMPLICON 0x14dc
#define PCI_DEVICE_ID_PCI230 0x0000 #define PCI_DEVICE_ID_PCI230 0x0000
#define PCI_DEVICE_ID_PCI260 0x0006 #define PCI_DEVICE_ID_PCI260 0x0006
#define PCI_DEVICE_ID_INVALID 0xffff #define PCI_DEVICE_ID_INVALID 0xffff
......
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