Skip to content

L
linux
Commit 5bdee661 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files
Options

staging: comedi: adl_pci9118: rename 'AdFunctionReg' 

Rename this CamelCase member of the private data.
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 26318c1c
Hide whitespace changes
Inline Side-by-side
Showing with 27 additions and 27 deletions
drivers/staging/comedi/drivers/adl_pci9118.c
View file @ 5bdee661
...@@ -229,7 +229,7 @@ struct pci9118_private { ...@@ -229,7 +229,7 @@ struct pci9118_private {
#endif #endif
unsigned char AdControlReg; /* A/D control register */ unsigned char AdControlReg; /* A/D control register */
unsigned char IntControlReg; /* Interrupt control register */ unsigned char IntControlReg; /* Interrupt control register */
unsigned char AdFunctionReg; /* A/D function register */ unsigned char ai_cfg;
char ai_neverending; /* we do unlimited AI */ char ai_neverending; /* we do unlimited AI */
unsigned int ai_do; /* what do AI? 0=nothing, 1 to 4 mode */ unsigned int ai_do; /* what do AI? 0=nothing, 1 to 4 mode */
unsigned int ai_act_scan; /* how many scans we finished */ unsigned int ai_act_scan; /* how many scans we finished */
...@@ -486,8 +486,8 @@ static int pci9118_insn_read_ai(struct comedi_device *dev, ...@@ -486,8 +486,8 @@ static int pci9118_insn_read_ai(struct comedi_device *dev,
*/ */
pci9118_ai_set_range_aref(dev, s, insn->chanspec); pci9118_ai_set_range_aref(dev, s, insn->chanspec);
devpriv->AdFunctionReg = PCI9118_AI_CFG_PDTRG | PCI9118_AI_CFG_PETRG; devpriv->ai_cfg = PCI9118_AI_CFG_PDTRG | PCI9118_AI_CFG_PETRG;
outl(devpriv->AdFunctionReg, dev->iobase + PCI9118_AI_CFG_REG); outl(devpriv->ai_cfg, dev->iobase + PCI9118_AI_CFG_REG);
/* /*
* positive triggers, no S&H, * positive triggers, no S&H,
* no burst, burst stop, * no burst, burst stop,
...@@ -526,14 +526,14 @@ static void interrupt_pci9118_ai_mode4_switch(struct comedi_device *dev) ...@@ -526,14 +526,14 @@ static void interrupt_pci9118_ai_mode4_switch(struct comedi_device *dev)
{ {
struct pci9118_private *devpriv = dev->private; struct pci9118_private *devpriv = dev->private;
devpriv->AdFunctionReg = PCI9118_AI_CFG_PDTRG | PCI9118_AI_CFG_PETRG | devpriv->ai_cfg = PCI9118_AI_CFG_PDTRG | PCI9118_AI_CFG_PETRG |
PCI9118_AI_CFG_AM; PCI9118_AI_CFG_AM;
outl(devpriv->AdFunctionReg, dev->iobase + PCI9118_AI_CFG_REG); outl(devpriv->ai_cfg, dev->iobase + PCI9118_AI_CFG_REG);
pci9118_timer_set_mode(dev, 0, I8254_MODE0); pci9118_timer_set_mode(dev, 0, I8254_MODE0);
pci9118_timer_write(dev, 0, pci9118_timer_write(dev, 0,
devpriv->dmabuf_hw[1 - devpriv->dma_actbuf] >> 1); devpriv->dmabuf_hw[1 - devpriv->dma_actbuf] >> 1);
devpriv->AdFunctionReg |= PCI9118_AI_CFG_START; devpriv->ai_cfg |= PCI9118_AI_CFG_START;
outl(devpriv->AdFunctionReg, dev->iobase + PCI9118_AI_CFG_REG); outl(devpriv->ai_cfg, dev->iobase + PCI9118_AI_CFG_REG);
} }
static unsigned int defragment_dma_buffer(struct comedi_device *dev, static unsigned int defragment_dma_buffer(struct comedi_device *dev,
...@@ -689,8 +689,8 @@ static int pci9118_ai_cancel(struct comedi_device *dev, ...@@ -689,8 +689,8 @@ static int pci9118_ai_cancel(struct comedi_device *dev,
devpriv->iobase_a + AMCC_OP_REG_MCSR); /* stop DMA */ devpriv->iobase_a + AMCC_OP_REG_MCSR); /* stop DMA */
pci9118_exttrg_del(dev, EXTTRG_AI); pci9118_exttrg_del(dev, EXTTRG_AI);
pci9118_start_pacer(dev, 0); /* stop 8254 counters */ pci9118_start_pacer(dev, 0); /* stop 8254 counters */
devpriv->AdFunctionReg = PCI9118_AI_CFG_PDTRG | PCI9118_AI_CFG_PETRG; devpriv->ai_cfg = PCI9118_AI_CFG_PDTRG | PCI9118_AI_CFG_PETRG;
outl(devpriv->AdFunctionReg, dev->iobase + PCI9118_AI_CFG_REG); outl(devpriv->ai_cfg, dev->iobase + PCI9118_AI_CFG_REG);
/* /*
* positive triggers, no S&H, no burst, * positive triggers, no S&H, no burst,
* burst stop, no post trigger, * burst stop, no post trigger,
...@@ -974,7 +974,7 @@ static int pci9118_ai_inttrig(struct comedi_device *dev, ...@@ -974,7 +974,7 @@ static int pci9118_ai_inttrig(struct comedi_device *dev,
s->async->inttrig = NULL; s->async->inttrig = NULL;
outl(devpriv->IntControlReg, dev->iobase + PCI9118_INT_CTRL_REG); outl(devpriv->IntControlReg, dev->iobase + PCI9118_INT_CTRL_REG);
outl(devpriv->AdFunctionReg, dev->iobase + PCI9118_AI_CFG_REG); outl(devpriv->ai_cfg, dev->iobase + PCI9118_AI_CFG_REG);
if (devpriv->ai_do != 3) { if (devpriv->ai_do != 3) {
pci9118_start_pacer(dev, devpriv->ai_do); pci9118_start_pacer(dev, devpriv->ai_do);
devpriv->AdControlReg |= PCI9118_AI_CTRL_SOFTG; devpriv->AdControlReg |= PCI9118_AI_CTRL_SOFTG;
...@@ -1327,7 +1327,7 @@ static int pci9118_ai_docmd_sampl(struct comedi_device *dev, ...@@ -1327,7 +1327,7 @@ static int pci9118_ai_docmd_sampl(struct comedi_device *dev,
if (!(devpriv->ai12_startstop & (START_AI_EXT | START_AI_INT))) { if (!(devpriv->ai12_startstop & (START_AI_EXT | START_AI_INT))) {
outl(devpriv->IntControlReg, outl(devpriv->IntControlReg,
dev->iobase + PCI9118_INT_CTRL_REG); dev->iobase + PCI9118_INT_CTRL_REG);
outl(devpriv->AdFunctionReg, dev->iobase + PCI9118_AI_CFG_REG); outl(devpriv->ai_cfg, dev->iobase + PCI9118_AI_CFG_REG);
if (devpriv->ai_do != 3) { if (devpriv->ai_do != 3) {
pci9118_start_pacer(dev, devpriv->ai_do); pci9118_start_pacer(dev, devpriv->ai_do);
devpriv->AdControlReg |= PCI9118_AI_CTRL_SOFTG; devpriv->AdControlReg |= PCI9118_AI_CTRL_SOFTG;
...@@ -1355,31 +1355,31 @@ static int pci9118_ai_docmd_dma(struct comedi_device *dev, ...@@ -1355,31 +1355,31 @@ static int pci9118_ai_docmd_dma(struct comedi_device *dev,
case 2: case 2:
devpriv->AdControlReg |= PCI9118_AI_CTRL_TMRTR | devpriv->AdControlReg |= PCI9118_AI_CTRL_TMRTR |
PCI9118_AI_CTRL_DMA; PCI9118_AI_CTRL_DMA;
devpriv->AdFunctionReg = PCI9118_AI_CFG_PDTRG | devpriv->ai_cfg = PCI9118_AI_CFG_PDTRG |
PCI9118_AI_CFG_PETRG | PCI9118_AI_CFG_PETRG |
PCI9118_AI_CFG_BM | PCI9118_AI_CFG_BM |
PCI9118_AI_CFG_BS; PCI9118_AI_CFG_BS;
if (cmd->convert_src == TRIG_NOW && !devpriv->softsshdelay) if (cmd->convert_src == TRIG_NOW && !devpriv->softsshdelay)
devpriv->AdFunctionReg |= PCI9118_AI_CFG_BSSH; devpriv->ai_cfg |= PCI9118_AI_CFG_BSSH;
outl(devpriv->ai_n_realscanlen, outl(devpriv->ai_n_realscanlen,
dev->iobase + PCI9118_AI_BURST_NUM_REG); 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 |
PCI9118_AI_CTRL_DMA; PCI9118_AI_CTRL_DMA;
devpriv->AdFunctionReg = PCI9118_AI_CFG_PDTRG | devpriv->ai_cfg = PCI9118_AI_CFG_PDTRG |
PCI9118_AI_CFG_PETRG; PCI9118_AI_CFG_PETRG;
break; break;
case 4: case 4:
devpriv->AdControlReg |= PCI9118_AI_CTRL_TMRTR | devpriv->AdControlReg |= PCI9118_AI_CTRL_TMRTR |
PCI9118_AI_CTRL_DMA; PCI9118_AI_CTRL_DMA;
devpriv->AdFunctionReg = PCI9118_AI_CFG_PDTRG | devpriv->ai_cfg = PCI9118_AI_CFG_PDTRG |
PCI9118_AI_CFG_PETRG | PCI9118_AI_CFG_PETRG |
PCI9118_AI_CFG_AM; PCI9118_AI_CFG_AM;
outl(devpriv->AdFunctionReg, dev->iobase + PCI9118_AI_CFG_REG); outl(devpriv->ai_cfg, dev->iobase + PCI9118_AI_CFG_REG);
pci9118_timer_set_mode(dev, 0, I8254_MODE0); pci9118_timer_set_mode(dev, 0, I8254_MODE0);
pci9118_timer_write(dev, 0, devpriv->dmabuf_hw[0] >> 1); pci9118_timer_write(dev, 0, devpriv->dmabuf_hw[0] >> 1);
devpriv->AdFunctionReg |= PCI9118_AI_CFG_START; devpriv->ai_cfg |= PCI9118_AI_CFG_START;
break; break;
default: default:
dev_err(dev->class_dev, "%s mode number bug!\n", __func__); dev_err(dev->class_dev, "%s mode number bug!\n", __func__);
...@@ -1395,7 +1395,7 @@ static int pci9118_ai_docmd_dma(struct comedi_device *dev, ...@@ -1395,7 +1395,7 @@ static int pci9118_ai_docmd_dma(struct comedi_device *dev,
devpriv->iobase_a + AMCC_OP_REG_INTCSR); devpriv->iobase_a + AMCC_OP_REG_INTCSR);
if (!(devpriv->ai12_startstop & (START_AI_EXT | START_AI_INT))) { if (!(devpriv->ai12_startstop & (START_AI_EXT | START_AI_INT))) {
outl(devpriv->AdFunctionReg, dev->iobase + PCI9118_AI_CFG_REG); outl(devpriv->ai_cfg, dev->iobase + PCI9118_AI_CFG_REG);
outl(devpriv->IntControlReg, outl(devpriv->IntControlReg,
dev->iobase + PCI9118_INT_CTRL_REG); dev->iobase + PCI9118_INT_CTRL_REG);
if (devpriv->ai_do != 3) { if (devpriv->ai_do != 3) {
...@@ -1582,13 +1582,13 @@ static int pci9118_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) ...@@ -1582,13 +1582,13 @@ static int pci9118_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
pci9118_start_pacer(dev, -1); /* stop pacer */ pci9118_start_pacer(dev, -1); /* stop pacer */
devpriv->AdFunctionReg = PCI9118_AI_CFG_PDTRG | PCI9118_AI_CFG_PETRG; devpriv->ai_cfg = PCI9118_AI_CFG_PDTRG | PCI9118_AI_CFG_PETRG;
/* /*
* positive triggers, no S&H, no burst, * positive triggers, no S&H, no burst,
* burst stop, no post trigger, * burst stop, no post trigger,
* no about trigger, trigger stop * no about trigger, trigger stop
*/ */
outl(devpriv->AdFunctionReg, dev->iobase + PCI9118_AI_CFG_REG); outl(devpriv->ai_cfg, dev->iobase + PCI9118_AI_CFG_REG);
udelay(1); udelay(1);
pci9118_ai_reset_fifo(dev); pci9118_ai_reset_fifo(dev);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7