openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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 <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2014-11-11 16:55:33 -07:00 committed by Greg Kroah-Hartman
parent d443fae234
commit 0db01ed89e
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/staging/comedi/drivers/dmm32at.c
View File

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