Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0db01ed8 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

staging: comedi: dmm32at: rename DMM32AT_DAC[LM]SB 



For aesthetics, rename these defines used for the D/A LSB/MSB registers.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d443fae2

drivers/staging/comedi/drivers/dmm32at.c

+5 −6
Original line number Diff line number Diff line
@@ -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;

	}