diff options
| author |   H Hartley Sweeten <hsweeten@visionengravers.com> | 2015-01-13 10:16:20 -0700 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-01-17 14:31:29 -0800 |
| commit | 9cf2765f5e39ffd600715a4b19e5fface154ba32 (patch) | |
| tree | e6991520defcc0d8248753df30856b0d7de6f49c /drivers/staging/comedi/drivers/pcl818.c | |
| parent | staging: comedi: das16: board is not a PCI device (diff) | |
| download | linux-dev-9cf2765f5e39ffd600715a4b19e5fface154ba32.tar.xz linux-dev-9cf2765f5e39ffd600715a4b19e5fface154ba32.zip | |
staging: comedi: pcl818: introduce pcl818_isadma_program()
Introduce a helper function to program the ISA DMA controller. Program
the ISA DMA as described in Documentation/DMA-ISA-LPC.txt.
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/staging/comedi/drivers/pcl818.c')
| -rw-r--r-- | drivers/staging/comedi/drivers/pcl818.c | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/drivers/staging/comedi/drivers/pcl818.c b/drivers/staging/comedi/drivers/pcl818.c index 19f6b595a80e..4f5f4e94ae0f 100644 --- a/drivers/staging/comedi/drivers/pcl818.c +++ b/drivers/staging/comedi/drivers/pcl818.c @@ -328,6 +328,20 @@ struct pcl818_private { unsigned int ai_cmd_canceled:1; }; +static void pcl818_isadma_program(unsigned int dma_chan, + struct pcl818_dma_desc *dma) +{ + unsigned long flags; + + flags = claim_dma_lock(); + clear_dma_ff(dma_chan); + set_dma_mode(dma_chan, DMA_MODE_READ); + set_dma_addr(dma_chan, dma->hw_addr); + set_dma_count(dma_chan, dma->size); + enable_dma(dma_chan); + release_dma_lock(flags); +} + static void pcl818_start_pacer(struct comedi_device *dev, bool load_counters) { struct pcl818_private *devpriv = dev->private; @@ -349,7 +363,6 @@ static void pcl818_ai_setup_dma(struct comedi_device *dev, struct pcl818_private *devpriv = dev->private; struct pcl818_dma_desc *dma = &devpriv->dma_desc[0]; struct comedi_cmd *cmd = &s->async->cmd; - unsigned int flags; disable_dma(devpriv->dma); /* disable dma */ if (cmd->stop_src == TRIG_COUNT) { @@ -364,13 +377,8 @@ static void pcl818_ai_setup_dma(struct comedi_device *dev, } devpriv->cur_dma = 0; - set_dma_mode(devpriv->dma, DMA_MODE_READ); - flags = claim_dma_lock(); - clear_dma_ff(devpriv->dma); - set_dma_addr(devpriv->dma, dma->hw_addr); - set_dma_count(devpriv->dma, dma->size); - release_dma_lock(flags); - enable_dma(devpriv->dma); + + pcl818_isadma_program(devpriv->dma, dma); } static void pcl818_ai_setup_next_dma(struct comedi_device *dev, @@ -379,7 +387,6 @@ static void pcl818_ai_setup_next_dma(struct comedi_device *dev, struct pcl818_private *devpriv = dev->private; struct comedi_cmd *cmd = &s->async->cmd; struct pcl818_dma_desc *dma; - unsigned long flags; disable_dma(devpriv->dma); devpriv->cur_dma = 1 - devpriv->cur_dma; @@ -390,12 +397,8 @@ static void pcl818_ai_setup_next_dma(struct comedi_device *dev, dma->size = devpriv->hwdmasize; else dma->size = devpriv->last_dma_run; - set_dma_mode(devpriv->dma, DMA_MODE_READ); - flags = claim_dma_lock(); - set_dma_addr(devpriv->dma, dma->hw_addr); - set_dma_count(devpriv->dma, dma->size); - release_dma_lock(flags); - enable_dma(devpriv->dma); + + pcl818_isadma_program(devpriv->dma, dma); } devpriv->dma_runs_to_end--; |