[PATCH 27/30] staging: comedi: adl_pci9118: introduce pci9118_ai_cmd_start()
H Hartley Sweeten
hsweeten at visionengravers.com
Tue Sep 9 20:05:52 UTC 2014
Introduce a helper function to start the async command.
Signed-off-by: H Hartley Sweeten <hsweeten at visionengravers.com>
Cc: Ian Abbott <abbotti at mev.co.uk>
Cc: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
---
drivers/staging/comedi/drivers/adl_pci9118.c | 43 ++++++++++++----------------
1 file changed, 18 insertions(+), 25 deletions(-)
diff --git a/drivers/staging/comedi/drivers/adl_pci9118.c b/drivers/staging/comedi/drivers/adl_pci9118.c
index 5588631..cf7bd2f 100644
--- a/drivers/staging/comedi/drivers/adl_pci9118.c
+++ b/drivers/staging/comedi/drivers/adl_pci9118.c
@@ -773,6 +773,19 @@ interrupt_exit:
return IRQ_HANDLED;
}
+static void pci9118_ai_cmd_start(struct comedi_device *dev)
+{
+ struct pci9118_private *devpriv = dev->private;
+
+ outl(devpriv->int_ctrl, dev->iobase + PCI9118_INT_CTRL_REG);
+ outl(devpriv->ai_cfg, dev->iobase + PCI9118_AI_CFG_REG);
+ if (devpriv->ai_do != 3) {
+ pci9118_start_pacer(dev, devpriv->ai_do);
+ devpriv->ai_ctrl |= PCI9118_AI_CTRL_SOFTG;
+ }
+ outl(devpriv->ai_ctrl, dev->iobase + PCI9118_AI_CTRL_REG);
+}
+
static int pci9118_ai_inttrig(struct comedi_device *dev,
struct comedi_subdevice *s,
unsigned int trig_num)
@@ -786,13 +799,7 @@ static int pci9118_ai_inttrig(struct comedi_device *dev,
devpriv->ai12_startstop &= ~START_AI_INT;
s->async->inttrig = NULL;
- outl(devpriv->int_ctrl, dev->iobase + PCI9118_INT_CTRL_REG);
- outl(devpriv->ai_cfg, dev->iobase + PCI9118_AI_CFG_REG);
- if (devpriv->ai_do != 3) {
- pci9118_start_pacer(dev, devpriv->ai_do);
- devpriv->ai_ctrl |= PCI9118_AI_CTRL_SOFTG;
- }
- outl(devpriv->ai_ctrl, dev->iobase + PCI9118_AI_CTRL_REG);
+ pci9118_ai_cmd_start(dev);
return 1;
}
@@ -1115,15 +1122,8 @@ static int pci9118_ai_docmd_sampl(struct comedi_device *dev,
pci9118_amcc_int_ena(dev, true);
- if (!(devpriv->ai12_startstop & (START_AI_EXT | START_AI_INT))) {
- outl(devpriv->int_ctrl, dev->iobase + PCI9118_INT_CTRL_REG);
- outl(devpriv->ai_cfg, dev->iobase + PCI9118_AI_CFG_REG);
- if (devpriv->ai_do != 3) {
- pci9118_start_pacer(dev, devpriv->ai_do);
- devpriv->ai_ctrl |= PCI9118_AI_CTRL_SOFTG;
- }
- outl(devpriv->int_ctrl, dev->iobase + PCI9118_INT_CTRL_REG);
- }
+ if (!(devpriv->ai12_startstop & (START_AI_EXT | START_AI_INT)))
+ pci9118_ai_cmd_start(dev);
return 0;
}
@@ -1172,15 +1172,8 @@ static int pci9118_ai_docmd_dma(struct comedi_device *dev,
outl(0x02000000 | AINT_WRITE_COMPL,
devpriv->iobase_a + AMCC_OP_REG_INTCSR);
- if (!(devpriv->ai12_startstop & (START_AI_EXT | START_AI_INT))) {
- outl(devpriv->ai_cfg, dev->iobase + PCI9118_AI_CFG_REG);
- outl(devpriv->int_ctrl, dev->iobase + PCI9118_INT_CTRL_REG);
- if (devpriv->ai_do != 3) {
- pci9118_start_pacer(dev, devpriv->ai_do);
- devpriv->ai_ctrl |= PCI9118_AI_CTRL_SOFTG;
- }
- outl(devpriv->ai_ctrl, dev->iobase + PCI9118_AI_CTRL_REG);
- }
+ if (!(devpriv->ai12_startstop & (START_AI_EXT | START_AI_INT)))
+ pci9118_ai_cmd_start(dev);
return 0;
}
--
2.0.3
More information about the devel
mailing list