shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 18:41:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

staging: comedi: addi_apci_3120: rename APCI3120_ENABLE_EXT_TRIGGER

Browse Source 
For aesthetics, rename this define.

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>
This commit is contained in:
H Hartley Sweeten
2014-11-04 10:54:00 -07:00
committed by Greg Kroah-Hartman
parent 20f75b5641
commit 6d210c8d96
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
View File

@@ -89,9 +89,6 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY
#define APCI3120_RD_STATUS 0x02
#define APCI3120_RD_FIFO 0x00
/* Enable external trigger bit in nWrAddress */
#define APCI3120_ENABLE_EXT_TRIGGER 0x8000
/* ANALOG OUTPUT AND INPUT DEFINE */
#define APCI3120_UNIPOLAR 0x80
#define APCI3120_BIPOLAR 0x00
@@ -484,7 +481,7 @@ static int apci3120_exttrig_enable(struct comedi_device *dev)
{
struct apci3120_private *devpriv = dev->private;
devpriv->ctrl |= APCI3120_ENABLE_EXT_TRIGGER;
devpriv->ctrl |= APCI3120_CTRL_EXT_TRIG;
outw(devpriv->ctrl, dev->iobase + APCI3120_WR_ADDRESS);
return 0;
}
@@ -493,7 +490,7 @@ static int apci3120_exttrig_disable(struct comedi_device *dev)
{
struct apci3120_private *devpriv = dev->private;
devpriv->ctrl &= ~APCI3120_ENABLE_EXT_TRIGGER;
devpriv->ctrl &= ~APCI3120_CTRL_EXT_TRIG;
outw(devpriv->ctrl, dev->iobase + APCI3120_WR_ADDRESS);
return 0;
}

1
drivers/staging/comedi/drivers/addi_apci_3120.c
View File

@@ -15,6 +15,7 @@
/*
* PCI BAR 1 register map (dev->iobase)
*/
#define APCI3120_CTRL_EXT_TRIG (1 << 15)
#define APCI3120_CTRL_GATE(x) (1 << (12 + (x)))
#define APCI3120_CTRL_PR(x) (((x) & 0xf) << 8)
#define APCI3120_CTRL_PA(x) (((x) & 0xf) << 0)