diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2015-08-07 11:45:03 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-08-14 18:34:56 -0700 |
| commit | 59c8f0dd76ac1358086ac79e177791683b1823d0 (patch) | |
| tree | 2232b79ee25fbe39ac3bc3bbf5eb973a1bf4c2e3 /drivers/staging/comedi | |
| parent | d5387751c34a6a02d715e4885239a05563a418b8 (diff) | |
| download | linux-59c8f0dd76ac1358086ac79e177791683b1823d0.tar.bz2 | |
staging: comedi: addi_apci_1564: define the APCI1564_DO_INT_CTRL_REG bits
Define the bits in this register. Remove the old defines in hwdrv_apci1564.c.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/comedi')
| -rw-r--r-- | drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c | 6 | ||||
| -rw-r--r-- | drivers/staging/comedi/drivers/addi_apci_1564.c | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c index 9c19648b003a..42a87b789f53 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c @@ -6,12 +6,6 @@ #define APCI1564_DI_INT_ENABLE 0x4 #define APCI1564_DI_INT_DISABLE 0xfffffffb -/* Digital Output Interrupt Enable Disable. */ -#define APCI1564_DO_VCC_INT_ENABLE 0x1 -#define APCI1564_DO_VCC_INT_DISABLE 0xfffffffe -#define APCI1564_DO_CC_INT_ENABLE 0x2 -#define APCI1564_DO_CC_INT_DISABLE 0xfffffffd - static int apci1564_timer_insn_config(struct comedi_device *dev, struct comedi_subdevice *s, struct comedi_insn *insn, diff --git a/drivers/staging/comedi/drivers/addi_apci_1564.c b/drivers/staging/comedi/drivers/addi_apci_1564.c index 33e58b9a21b2..873e329f4bfd 100644 --- a/drivers/staging/comedi/drivers/addi_apci_1564.c +++ b/drivers/staging/comedi/drivers/addi_apci_1564.c @@ -81,6 +81,8 @@ #define APCI1564_DI_IRQ_REG 0x10 #define APCI1564_DO_REG 0x14 #define APCI1564_DO_INT_CTRL_REG 0x18 +#define APCI1564_DO_INT_CTRL_CC_INT_ENA BIT(1) +#define APCI1564_DO_INT_CTRL_VCC_INT_ENA BIT(0) #define APCI1564_DO_INT_STATUS_REG 0x1c #define APCI1564_DO_IRQ_REG 0x20 #define APCI1564_WDOG_REG 0x24 |