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

staging: comedi: adl_pci9118: rename PCI9118_BURST define

Browse Source 
For aesthetics, rename this define used for the analog input burst
number 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:21 -07:00 committed by Greg Kroah-Hartman
parent 7e38f36b3b
commit 16d44e86d5
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -132,8 +132,8 @@
#define PCI9118_DIO_REG 0x1c #define PCI9118_DIO_REG 0x1c
#define PCI9118_SOFTTRG_REG 0x20 #define PCI9118_SOFTTRG_REG 0x20
#define PCI9118_AI_CHANLIST_REG 0x24 #define PCI9118_AI_CHANLIST_REG 0x24
#define PCI9118_AI_BURST_NUM_REG 0x28
#define PCI9118_BURST 0x28 /* W: A/D burst number register */
#define PCI9118_SCANMOD 0x2c /* W: A/D auto scan mode */ #define PCI9118_SCANMOD 0x2c /* W: A/D auto scan mode */
#define PCI9118_ADFUNC 0x30 /* W: A/D function register */ #define PCI9118_ADFUNC 0x30 /* W: A/D function register */
#define PCI9118_DELFIFO 0x34 /* W: A/D data FIFO reset */ #define PCI9118_DELFIFO 0x34 /* W: A/D data FIFO reset */
@ -783,7 +783,7 @@ static int pci9118_ai_cancel(struct comedi_device *dev,
* internal trigger, soft trigger, * internal trigger, soft trigger,
* disable INT and DMA * disable INT and DMA
*/ */
outl(0, dev->iobase + PCI9118_BURST); outl(0, dev->iobase + PCI9118_AI_BURST_NUM_REG);
outl(1, dev->iobase + PCI9118_SCANMOD); outl(1, dev->iobase + PCI9118_SCANMOD);
outl(2, dev->iobase + PCI9118_SCANMOD); /* reset scan queue */ outl(2, dev->iobase + PCI9118_SCANMOD); /* reset scan queue */
outl(0, dev->iobase + PCI9118_DELFIFO); /* flush FIFO */ outl(0, dev->iobase + PCI9118_DELFIFO); /* flush FIFO */
@ -1436,7 +1436,8 @@ static int pci9118_ai_docmd_dma(struct comedi_device *dev,
AdFunction_BS; AdFunction_BS;
if (cmd->convert_src == TRIG_NOW && !devpriv->softsshdelay) if (cmd->convert_src == TRIG_NOW && !devpriv->softsshdelay)
devpriv->AdFunctionReg |= AdFunction_BSSH; devpriv->AdFunctionReg |= AdFunction_BSSH;
outl(devpriv->ai_n_realscanlen, dev->iobase + PCI9118_BURST); outl(devpriv->ai_n_realscanlen,
dev->iobase + PCI9118_AI_BURST_NUM_REG);
break; break;
case 3: case 3:
devpriv->AdControlReg |= PCI9118_AI_CTRL_EXTM | devpriv->AdControlReg |= PCI9118_AI_CTRL_EXTM |
@ -1694,7 +1695,7 @@ static int pci9118_reset(struct comedi_device *dev)
* soft trigger, * soft trigger,
* disable INT and DMA * disable INT and DMA
*/ */
outl(0, dev->iobase + PCI9118_BURST); outl(0, dev->iobase + PCI9118_AI_BURST_NUM_REG);
outl(1, dev->iobase + PCI9118_SCANMOD); outl(1, dev->iobase + PCI9118_SCANMOD);
outl(2, dev->iobase + PCI9118_SCANMOD); /* reset scan queue */ outl(2, dev->iobase + PCI9118_SCANMOD); /* reset scan queue */
devpriv->AdFunctionReg = AdFunction_PDTrg | AdFunction_PETrg; devpriv->AdFunctionReg = AdFunction_PDTrg | AdFunction_PETrg;