UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: comedi: daqboard2000: redo DAC control register macros 

Rename the macros used to define values for the DAC control register to
avoid CamelCase and to make it clearer which register they are
associated with.  Refactor the macros used to define values to enable or
disable DAC channels to use the channel number as a parameter.  None of
these macros are currently used by the driver.

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:22 +01:00 committed by Greg Kroah-Hartman
parent 34d49fc07c
commit ab8a4dc859
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -225,20 +225,13 @@ static const struct comedi_lrange range_daqboard2000_ai = {
#define DAQBOARD2000_Dac3Busy 0x0080
/* DAC control */
#define DAQBOARD2000_Dac0Enable 0x0021
#define DAQBOARD2000_Dac1Enable 0x0031
#define DAQBOARD2000_Dac2Enable 0x0041
#define DAQBOARD2000_Dac3Enable 0x0051
#define DAQBOARD2000_DacEnableBit 0x0001
#define DAQBOARD2000_Dac0Disable 0x0020
#define DAQBOARD2000_Dac1Disable 0x0030
#define DAQBOARD2000_Dac2Disable 0x0040
#define DAQBOARD2000_Dac3Disable 0x0050
#define DAQBOARD2000_DacResetFifo 0x0004
#define DAQBOARD2000_DacPatternDisable 0x0060
#define DAQBOARD2000_DacPatternEnable 0x0061
#define DAQBOARD2000_DacSelectSignedData 0x0002
#define DAQBOARD2000_DacSelectUnsignedData 0x0000
#define DB2K_DAC_CONTROL_ENABLE_BIT 0x0001
#define DB2K_DAC_CONTROL_DATA_IS_SIGNED 0x0002
#define DB2K_DAC_CONTROL_RESET_FIFO 0x0004
#define DB2K_DAC_CONTROL_DAC_DISABLE(x) (0x0020 + ((x) << 4))
#define DB2K_DAC_CONTROL_DAC_ENABLE(x) (0x0021 + ((x) << 4))
#define DB2K_DAC_CONTROL_PATTERN_DISABLE 0x0060
#define DB2K_DAC_CONTROL_PATTERN_ENABLE 0x0061
/* Trigger Control */
#define DAQBOARD2000_TrigAnalog 0x0000