AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-21 03:21:56 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

staging: comedi: daqboard2000: rename trigger control register macros

Browse Source 
Rename the macros that define values for the trigger control register to
avoid CamelCase, and to make it clearer which register they are
associated with.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ian Abbott 2016-05-19 19:15:24 +01:00 committed by Greg Kroah-Hartman
parent 944f0d7f4b
commit 77b9634cbd
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/staging/comedi/drivers/daqboard2000.c
View File

@ -232,16 +232,16 @@ static const struct comedi_lrange range_daqboard2000_ai = {
#define DB2K_DAC_CONTROL_PATTERN_ENABLE 0x0061
/* Trigger Control */
#define DAQBOARD2000_TrigAnalog 0x0000
#define DAQBOARD2000_TrigTTL 0x0010
#define DAQBOARD2000_TrigTransHiLo 0x0004
#define DAQBOARD2000_TrigTransLoHi 0x0000
#define DAQBOARD2000_TrigAbove 0x0000
#define DAQBOARD2000_TrigBelow 0x0004
#define DAQBOARD2000_TrigLevelSense 0x0002
#define DAQBOARD2000_TrigEdgeSense 0x0000
#define DAQBOARD2000_TrigEnable 0x0001
#define DAQBOARD2000_TrigDisable 0x0000
#define DB2K_TRIG_CONTROL_TYPE_ANALOG 0x0000
#define DB2K_TRIG_CONTROL_TYPE_TTL 0x0010
#define DB2K_TRIG_CONTROL_EDGE_HI_LO 0x0004
#define DB2K_TRIG_CONTROL_EDGE_LO_HI 0x0000
#define DB2K_TRIG_CONTROL_LEVEL_ABOVE 0x0000
#define DB2K_TRIG_CONTROL_LEVEL_BELOW 0x0004
#define DB2K_TRIG_CONTROL_SENSE_LEVEL 0x0002
#define DB2K_TRIG_CONTROL_SENSE_EDGE 0x0000
#define DB2K_TRIG_CONTROL_ENABLE 0x0001
#define DB2K_TRIG_CONTROL_DISABLE 0x0000
/* Reference Dac Selection */
#define DAQBOARD2000_PosRefDacSelect 0x0100
@ -543,10 +543,10 @@ static void daqboard2000_adcDisarm(struct comedi_device *dev)
{
/* Disable hardware triggers */
udelay(2);
writew(DAQBOARD2000_TrigAnalog | DAQBOARD2000_TrigDisable,
writew(DB2K_TRIG_CONTROL_TYPE_ANALOG | DB2K_TRIG_CONTROL_DISABLE,
dev->mmio + DB2K_REG_TRIG_CONTROL);
udelay(2);
writew(DAQBOARD2000_TrigTTL | DAQBOARD2000_TrigDisable,
writew(DB2K_TRIG_CONTROL_TYPE_TTL | DB2K_TRIG_CONTROL_DISABLE,
dev->mmio + DB2K_REG_TRIG_CONTROL);
/* Stop the scan list FIFO from loading the configuration pipe */