|
@@ -1088,14 +1088,14 @@ static int das1800_ai_do_cmd(struct comedi_device *dev,
|
|
struct comedi_async *async = s->async;
|
|
struct comedi_async *async = s->async;
|
|
const struct comedi_cmd *cmd = &async->cmd;
|
|
const struct comedi_cmd *cmd = &async->cmd;
|
|
|
|
|
|
- /* disable dma on TRIG_WAKE_EOS, or CMDF_PRIORITY
|
|
|
|
|
|
+ /* disable dma on CMDF_WAKE_EOS, or CMDF_PRIORITY
|
|
* (because dma in handler is unsafe at hard real-time priority) */
|
|
* (because dma in handler is unsafe at hard real-time priority) */
|
|
- if (cmd->flags & (TRIG_WAKE_EOS | CMDF_PRIORITY))
|
|
|
|
|
|
+ if (cmd->flags & (CMDF_WAKE_EOS | CMDF_PRIORITY))
|
|
devpriv->irq_dma_bits &= ~DMA_ENABLED;
|
|
devpriv->irq_dma_bits &= ~DMA_ENABLED;
|
|
else
|
|
else
|
|
devpriv->irq_dma_bits |= devpriv->dma_bits;
|
|
devpriv->irq_dma_bits |= devpriv->dma_bits;
|
|
- /* interrupt on end of conversion for TRIG_WAKE_EOS */
|
|
|
|
- if (cmd->flags & TRIG_WAKE_EOS) {
|
|
|
|
|
|
+ /* interrupt on end of conversion for CMDF_WAKE_EOS */
|
|
|
|
+ if (cmd->flags & CMDF_WAKE_EOS) {
|
|
/* interrupt fifo not empty */
|
|
/* interrupt fifo not empty */
|
|
devpriv->irq_dma_bits &= ~FIMD;
|
|
devpriv->irq_dma_bits &= ~FIMD;
|
|
} else {
|
|
} else {
|