diff options
| author | H Hartley Sweeten <[email protected]> | 2014-11-11 16:55:33 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <[email protected]> | 2014-11-26 15:33:24 -0800 |
| commit | 0db01ed89ee9a5474a6bbf55bda75baddf94b623 (patch) | |
| tree | cf150470a294b69a2e79a8f89941ff338adfa24c | |
| parent | d443fae2341abddf04676deed0b8b3112eb17636 (diff) | |
staging: comedi: dmm32at: rename DMM32AT_DAC[LM]SB
For aesthetics, rename these defines used for the D/A LSB/MSB registers.
Signed-off-by: H Hartley Sweeten <[email protected]>
Reviewed-by: Ian Abbott <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
| -rw-r--r-- | drivers/staging/comedi/drivers/dmm32at.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/staging/comedi/drivers/dmm32at.c b/drivers/staging/comedi/drivers/dmm32at.c index f0519bc0cd9e..39f416c3c402 100644 --- a/drivers/staging/comedi/drivers/dmm32at.c +++ b/drivers/staging/comedi/drivers/dmm32at.c @@ -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; } |