For aesthetic reasons, rename these functions to match the namespace
of the rest of the driver. Also, remove the unnecessary comments.
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>
return inb(dev->iobase + 7);
}
return inb(dev->iobase + 7);
}
-/* enable_das800 makes the card start taking hardware triggered conversions */
-static void enable_das800(struct comedi_device *dev)
+static void das800_enable(struct comedi_device *dev)
{
const struct das800_board *thisboard = comedi_board(dev);
struct das800_private *devpriv = dev->private;
{
const struct das800_board *thisboard = comedi_board(dev);
struct das800_private *devpriv = dev->private;
spin_unlock_irqrestore(&dev->spinlock, irq_flags);
}
spin_unlock_irqrestore(&dev->spinlock, irq_flags);
}
-/* disable_das800 stops hardware triggered conversions */
-static void disable_das800(struct comedi_device *dev)
+static void das800_disable(struct comedi_device *dev)
{
unsigned long irq_flags;
{
unsigned long irq_flags;
devpriv->forever = 0;
devpriv->count = 0;
devpriv->forever = 0;
devpriv->count = 0;
unsigned long irq_flags;
struct comedi_async *async = s->async;
unsigned long irq_flags;
struct comedi_async *async = s->async;
/* set channel scan limits */
startChan = CR_CHAN(async->cmd.chanlist[0]);
/* set channel scan limits */
startChan = CR_CHAN(async->cmd.chanlist[0]);
spin_unlock_irqrestore(&dev->spinlock, irq_flags);
async->events = 0;
spin_unlock_irqrestore(&dev->spinlock, irq_flags);
async->events = 0;
/* otherwise, stop taking data */
} else {
spin_unlock_irqrestore(&dev->spinlock, irq_flags);
/* otherwise, stop taking data */
} else {
spin_unlock_irqrestore(&dev->spinlock, irq_flags);
- disable_das800(dev); /* disable hardware triggered conversions */
async->events |= COMEDI_CB_EOA;
}
comedi_event(dev, s);
async->events |= COMEDI_CB_EOA;
}
comedi_event(dev, s);
int timeout = 1000;
unsigned long irq_flags;
int timeout = 1000;
unsigned long irq_flags;
- disable_das800(dev); /* disable hardware conversions (enables software conversions) */
/* set multiplexer */
chan = CR_CHAN(insn->chanspec);
/* set multiplexer */
chan = CR_CHAN(insn->chanspec);
s->range_table = &range_digital;
s->insn_bits = das800_do_insn_bits;
s->range_table = &range_digital;
s->insn_bits = das800_do_insn_bits;
/* initialize digital out channels */
spin_lock_irqsave(&dev->spinlock, irq_flags);
/* initialize digital out channels */
spin_lock_irqsave(&dev->spinlock, irq_flags);