Rename the macros that define values for the reference DACs register to
avoid CamelCase, and to make it clearer which register they are
associated with.  Add a macro `DAQBOARD2000_REF_DACS_SET` for the value
`0x80` that triggers setting one of the references.

Signed-off-by: Ian Abbott <abbo...@mev.co.uk>
---
 drivers/staging/comedi/drivers/daqboard2000.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/comedi/drivers/daqboard2000.c 
b/drivers/staging/comedi/drivers/daqboard2000.c
index b6b4ee4..7034e68 100644
--- a/drivers/staging/comedi/drivers/daqboard2000.c
+++ b/drivers/staging/comedi/drivers/daqboard2000.c
@@ -244,8 +244,9 @@ static const struct comedi_lrange range_daqboard2000_ai = {
 #define DAQBOARD2000_TRIG_CONTROL_DISABLE                      0x0000
 
 /* Reference Dac Selection */
-#define DAQBOARD2000_PosRefDacSelect             0x0100
-#define DAQBOARD2000_NegRefDacSelect             0x0000
+#define DAQBOARD2000_REF_DACS_SET                              0x0080
+#define DAQBOARD2000_REF_DACS_SELECT_POS_REF                   0x0100
+#define DAQBOARD2000_REF_DACS_SELECT_NEG_REF                   0x0000
 
 struct daq200_boardtype {
        const char *name;
@@ -571,7 +572,7 @@ static void daqboard2000_activateReferenceDacs(struct 
comedi_device *dev)
        int timeout;
 
        /*  Set the + reference dac value in the FPGA */
-       writew(0x80 | DAQBOARD2000_PosRefDacSelect,
+       writew(DAQBOARD2000_REF_DACS_SET | DAQBOARD2000_REF_DACS_SELECT_POS_REF,
               dev->mmio + DAQBOARD2000_REG_REF_DACS);
        for (timeout = 0; timeout < 20; timeout++) {
                val = readw(dev->mmio + DAQBOARD2000_REG_DAC_STATUS);
@@ -581,7 +582,7 @@ static void daqboard2000_activateReferenceDacs(struct 
comedi_device *dev)
        }
 
        /*  Set the - reference dac value in the FPGA */
-       writew(0x80 | DAQBOARD2000_NegRefDacSelect,
+       writew(DAQBOARD2000_REF_DACS_SET | DAQBOARD2000_REF_DACS_SELECT_NEG_REF,
               dev->mmio + DAQBOARD2000_REG_REF_DACS);
        for (timeout = 0; timeout < 20; timeout++) {
                val = readw(dev->mmio + DAQBOARD2000_REG_DAC_STATUS);
-- 
2.8.1

Reply via email to