diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2014-11-11 16:55:37 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-26 15:33:25 -0800 |
| commit | b8c17c479ae429e2e696f219781e6ad8799a04f2 (patch) | |
| tree | dab254d652b71028b06f02fc9db906cbf0bf3a97 /drivers | |
| parent | d18f166773c77a8bc4bd14652b0c915d1195f80e (diff) | |
staging: comedi: dmm32at: rename DMM32AT_FIFOCNTRL
For aesthetics, rename this define used for the FIFO Control register.
Also, rename the defines used for the bits of this register.
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/comedi/drivers/dmm32at.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/drivers/staging/comedi/drivers/dmm32at.c b/drivers/staging/comedi/drivers/dmm32at.c index 463a62b843bc..a58d51d1f533 100644 --- a/drivers/staging/comedi/drivers/dmm32at.c +++ b/drivers/staging/comedi/drivers/dmm32at.c @@ -61,8 +61,10 @@ Configuration Options: #define DMM32AT_AO_MSB_REG 0x05 #define DMM32AT_AO_MSB_DACH(x) ((x) << 6) #define DMM32AT_FIFO_DEPTH_REG 0x06 - -#define DMM32AT_FIFOCNTRL 0x07 +#define DMM32AT_FIFO_CTRL_REG 0x07 +#define DMM32AT_FIFO_CTRL_FIFOEN (1 << 3) +#define DMM32AT_FIFO_CTRL_SCANEN (1 << 2) +#define DMM32AT_FIFO_CTRL_FIFORST (1 << 1) #define DMM32AT_FIFOSTAT 0x07 #define DMM32AT_CNTRL 0x08 @@ -83,10 +85,6 @@ Configuration Options: /* Board register values. */ -/* DMM32AT_FIFOCNTRL 0x07 */ -#define DMM32AT_FIFORESET 0x02 -#define DMM32AT_SCANENABLE 0x04 - /* DMM32AT_CNTRL 0x08 */ #define DMM32AT_RESET 0x20 #define DMM32AT_INTRESET 0x08 @@ -155,10 +153,11 @@ static void dmm32at_ai_set_chanspec(struct comedi_device *dev, unsigned int range = CR_RANGE(chanspec); unsigned int last_chan = (chan + nchan - 1) % s->n_chan; - outb(DMM32AT_FIFORESET, dev->iobase + DMM32AT_FIFOCNTRL); + outb(DMM32AT_FIFO_CTRL_FIFORST, dev->iobase + DMM32AT_FIFO_CTRL_REG); if (nchan > 1) - outb(DMM32AT_SCANENABLE, dev->iobase + DMM32AT_FIFOCNTRL); + outb(DMM32AT_FIFO_CTRL_SCANEN, + dev->iobase + DMM32AT_FIFO_CTRL_REG); outb(chan, dev->iobase + DMM32AT_AI_LO_CHAN_REG); outb(last_chan, dev->iobase + DMM32AT_AI_HI_CHAN_REG); @@ -490,7 +489,7 @@ static int dmm32at_reset(struct comedi_device *dev) udelay(1000); /* zero scan and fifo control */ - outb(0x0, dev->iobase + DMM32AT_FIFOCNTRL); + outb(0x0, dev->iobase + DMM32AT_FIFO_CTRL_REG); /* zero interrupt and clock control */ outb(0x0, dev->iobase + DMM32AT_INTCLOCK); |