Commit bb8ef923 authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman

staging: comedi: amplc_pci230: change pci230_handle_ao_fifo() return type

Change the return type of `pci230_handle_ao_fifo()` from `int` to
`bool`.  A return value of `true` indicates the AO command is still
running.
Signed-off-by: default avatarIan Abbott <abbotti@mev.co.uk>
Reviewed-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 39455e17
...@@ -1109,9 +1109,11 @@ static void pci230_handle_ao_nofifo(struct comedi_device *dev, ...@@ -1109,9 +1109,11 @@ static void pci230_handle_ao_nofifo(struct comedi_device *dev,
} }
} }
/* Loads DAC FIFO (if using it) from buffer. */ /*
/* Returns 0 if AO finished due to completion or error, 1 if still going. */ * Loads DAC FIFO (if using it) from buffer.
static int pci230_handle_ao_fifo(struct comedi_device *dev, * Returns false if AO finished due to completion or error, true if still going.
*/
static bool pci230_handle_ao_fifo(struct comedi_device *dev,
struct comedi_subdevice *s) struct comedi_subdevice *s)
{ {
struct pci230_private *devpriv = dev->private; struct pci230_private *devpriv = dev->private;
...@@ -1122,7 +1124,7 @@ static int pci230_handle_ao_fifo(struct comedi_device *dev, ...@@ -1122,7 +1124,7 @@ static int pci230_handle_ao_fifo(struct comedi_device *dev,
unsigned short dacstat; unsigned short dacstat;
unsigned int i, n; unsigned int i, n;
unsigned int events = 0; unsigned int events = 0;
int running; bool running;
/* Get DAC FIFO status. */ /* Get DAC FIFO status. */
dacstat = inw(devpriv->daqio + PCI230_DACCON); dacstat = inw(devpriv->daqio + PCI230_DACCON);
...@@ -1207,9 +1209,9 @@ static int pci230_handle_ao_fifo(struct comedi_device *dev, ...@@ -1207,9 +1209,9 @@ static int pci230_handle_ao_fifo(struct comedi_device *dev,
if (events & (COMEDI_CB_EOA | COMEDI_CB_ERROR | COMEDI_CB_OVERFLOW)) { if (events & (COMEDI_CB_EOA | COMEDI_CB_ERROR | COMEDI_CB_OVERFLOW)) {
/* Stopping AO due to completion or error. */ /* Stopping AO due to completion or error. */
pci230_ao_stop(dev, s); pci230_ao_stop(dev, s);
running = 0; running = false;
} else { } else {
running = 1; running = true;
} }
async->events |= events; async->events |= events;
return running; return running;
...@@ -1267,7 +1269,7 @@ static void pci230_ao_start(struct comedi_device *dev, ...@@ -1267,7 +1269,7 @@ static void pci230_ao_start(struct comedi_device *dev,
if (devpriv->hwver >= 2) { if (devpriv->hwver >= 2) {
/* Using DAC FIFO. */ /* Using DAC FIFO. */
unsigned short scantrig; unsigned short scantrig;
int run; bool run;
/* Preload FIFO data. */ /* Preload FIFO data. */
run = pci230_handle_ao_fifo(dev, s); run = pci230_handle_ao_fifo(dev, s);
......
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