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 <abbo...@mev.co.uk>
---
drivers/staging/comedi/drivers/daqboard2000.c | 21 +++++++--------------
1 file changed, 7 insertions(+), 14 deletions(-)
diff --git a/drivers/staging/comedi/drivers/daqboard2000.c
b/drivers/staging/comedi/drivers/daqboard2000.c
index 2cdd882..4066cfa 100644
--- a/drivers/staging/comedi/drivers/daqboard2000.c
+++ b/drivers/staging/comedi/drivers/daqboard2000.c
@@ -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 DAQBOARD2000_DAC_CONTROL_ENABLE_BIT 0x0001
+#define DAQBOARD2000_DAC_CONTROL_DATA_IS_SIGNED 0x0002
+#define DAQBOARD2000_DAC_CONTROL_RESET_FIFO 0x0004
+#define DAQBOARD2000_DAC_CONTROL_DAC_DISABLE(x) (0x0020 + ((x)
<< 4))
+#define DAQBOARD2000_DAC_CONTROL_DAC_ENABLE(x) (0x0021 + ((x) << 4))
+#define DAQBOARD2000_DAC_CONTROL_PATTERN_DISABLE 0x0060
+#define DAQBOARD2000_DAC_CONTROL_PATTERN_ENABLE 0x0061
/* Trigger Control */
#define DAQBOARD2000_TrigAnalog 0x0000
--
2.8.1
_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
