]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
staging: comedi: dmm32at: rename DMM32AT_DAC[LM]SB
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Tue, 11 Nov 2014 23:55:33 +0000 (16:55 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 26 Nov 2014 23:33:24 +0000 (15:33 -0800)
For aesthetics, rename these defines used for the D/A LSB/MSB registers.

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>
drivers/staging/comedi/drivers/dmm32at.c

index f0519bc0cd9ec87b0ce363224e35fadb4438834a..39f416c3c402756bae7952e8ba1443042c2adc33 100644 (file)
@@ -50,10 +50,9 @@ Configuration Options:
 #define DMM32AT_AI_MSB_REG             0x01
 #define DMM32AT_AI_LO_CHAN_REG         0x02
 #define DMM32AT_AI_HI_CHAN_REG         0x03
-
 #define DMM32AT_DACSTAT 0x04
-#define DMM32AT_DACLSB_REG     0x04
-#define DMM32AT_DACMSB_REG     0x05
+#define DMM32AT_AO_LSB_REG             0x04
+#define DMM32AT_AO_MSB_REG             0x05
 #define DMM32AT_DACMSB_CHAN(x) ((x) << 6)
 
 #define DMM32AT_FIFOCNTRL 0x07
@@ -444,9 +443,9 @@ static int dmm32at_ao_insn_write(struct comedi_device *dev,
                int ret;
 
                /* write LSB then MSB + chan to load DAC */
-               outb(val & 0xff, dev->iobase + DMM32AT_DACLSB_REG);
+               outb(val & 0xff, dev->iobase + DMM32AT_AO_LSB_REG);
                outb((val >> 8) | DMM32AT_DACMSB_CHAN(chan),
-                    dev->iobase + DMM32AT_DACMSB_REG);
+                    dev->iobase + DMM32AT_AO_MSB_REG);
 
                /* wait for circuit to settle */
                ret = comedi_timeout(dev, s, insn, dmm32at_ao_eoc, 0);
@@ -454,7 +453,7 @@ static int dmm32at_ao_insn_write(struct comedi_device *dev,
                        return ret;
 
                /* dummy read to update DAC */
-               inb(dev->iobase + DMM32AT_DACMSB_REG);
+               inb(dev->iobase + DMM32AT_AO_MSB_REG);
 
                s->readback[chan] = val;
        }