leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: comedi: adl_pci9118: rename PCI9118_GAIN define

Browse Source 
For aesthetics, rename this define used for the analog input chanlist
programming 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>
This commit is contained in:
H Hartley Sweeten 2014-09-04 12:14:20 -07:00 committed by Greg Kroah-Hartman
parent 1750bed3f7
commit 7e38f36b3b
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/staging/comedi/drivers/adl_pci9118.c
View File

@ -131,8 +131,8 @@
#define PCI9118_AI_CTRL_DMA (1 << 0) /* 1=enable DMA */
#define PCI9118_DIO_REG 0x1c
#define PCI9118_SOFTTRG_REG 0x20
#define PCI9118_AI_CHANLIST_REG 0x24
#define PCI9118_GAIN 0x24 /* W: A/D gain/channel register */
#define PCI9118_BURST 0x28 /* W: A/D burst number register */
#define PCI9118_SCANMOD 0x2c /* W: A/D auto scan mode */
#define PCI9118_ADFUNC 0x30 /* W: A/D function register */
@ -438,7 +438,8 @@ static int setup_channel_list(struct comedi_device *dev,
gain = CR_RANGE(chanlist[0]);
/* get gain number */
scanquad |= ((gain & 0x03) << 8);
outl(scanquad | ssh, dev->iobase + PCI9118_GAIN);
outl(scanquad | ssh,
dev->iobase + PCI9118_AI_CHANLIST_REG);
ssh = devpriv->softsshhold;
}
}
@ -450,7 +451,7 @@ static int setup_channel_list(struct comedi_device *dev,
#endif
gain = CR_RANGE(chanlist[i]); /* get gain number */
scanquad |= ((gain & 0x03) << 8);
outl(scanquad | ssh, dev->iobase + PCI9118_GAIN);
outl(scanquad | ssh, dev->iobase + PCI9118_AI_CHANLIST_REG);
}
if (backadd) { /* insert channels for fit onto 32bit DMA */
@ -459,7 +460,8 @@ static int setup_channel_list(struct comedi_device *dev,
/* get channel number */
gain = CR_RANGE(chanlist[0]); /* get gain number */
scanquad |= ((gain & 0x03) << 8);
outl(scanquad | ssh, dev->iobase + PCI9118_GAIN);
outl(scanquad | ssh,
dev->iobase + PCI9118_AI_CHANLIST_REG);
}
}
#ifdef PCI9118_PARANOIDCHECK