staging: comedi: add comedi_handle_events()
The "comedi_fc" module contains a few functions useful to Comedi drivers. Their functionality is being migrated to the core "comedi" module and renamed to start with the prefix `comedi_`. As part of this migration, move `cfc_handle_events()` into the core comedi module and rename it to `comedi_handle_events()`. Change the external declaration of `cfc_handle_events()` into an inline function that calls `comedi_handle_events()`. Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
1c38d6f22a
commit
5a78035924
|
@ -437,6 +437,9 @@ int comedi_timeout(struct comedi_device *, struct comedi_subdevice *,
|
|||
struct comedi_insn *, unsigned long context),
|
||||
unsigned long context);
|
||||
|
||||
unsigned int comedi_handle_events(struct comedi_device *dev,
|
||||
struct comedi_subdevice *s);
|
||||
|
||||
int comedi_dio_insn_config(struct comedi_device *, struct comedi_subdevice *,
|
||||
struct comedi_insn *, unsigned int *data,
|
||||
unsigned int mask);
|
||||
|
|
|
@ -351,6 +351,39 @@ void comedi_inc_scan_progress(struct comedi_subdevice *s,
|
|||
}
|
||||
EXPORT_SYMBOL_GPL(comedi_inc_scan_progress);
|
||||
|
||||
/**
|
||||
* comedi_handle_events - handle events and possibly stop acquisition
|
||||
* @dev: comedi_device struct
|
||||
* @s: comedi_subdevice struct
|
||||
*
|
||||
* Handles outstanding asynchronous acquisition event flags associated
|
||||
* with the subdevice. Call the subdevice's "->cancel()" handler if the
|
||||
* "end of acquisition", "error" or "overflow" event flags are set in order
|
||||
* to stop the acquisition at the driver level.
|
||||
*
|
||||
* Calls comedi_event() to further process the event flags, which may mark
|
||||
* the asynchronous command as no longer running, possibly terminated with
|
||||
* an error, and may wake up tasks.
|
||||
*
|
||||
* Return a bit-mask of the handled events.
|
||||
*/
|
||||
unsigned int comedi_handle_events(struct comedi_device *dev,
|
||||
struct comedi_subdevice *s)
|
||||
{
|
||||
unsigned int events = s->async->events;
|
||||
|
||||
if (events == 0)
|
||||
return events;
|
||||
|
||||
if (events & (COMEDI_CB_EOA | COMEDI_CB_ERROR | COMEDI_CB_OVERFLOW))
|
||||
s->cancel(dev, s);
|
||||
|
||||
comedi_event(dev, s);
|
||||
|
||||
return events;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(comedi_handle_events);
|
||||
|
||||
static int insn_rw_emulate_bits(struct comedi_device *dev,
|
||||
struct comedi_subdevice *s,
|
||||
struct comedi_insn *insn, unsigned int *data)
|
||||
|
|
|
@ -64,23 +64,6 @@ unsigned int cfc_read_array_from_buffer(struct comedi_subdevice *s,
|
|||
}
|
||||
EXPORT_SYMBOL_GPL(cfc_read_array_from_buffer);
|
||||
|
||||
unsigned int cfc_handle_events(struct comedi_device *dev,
|
||||
struct comedi_subdevice *s)
|
||||
{
|
||||
unsigned int events = s->async->events;
|
||||
|
||||
if (events == 0)
|
||||
return events;
|
||||
|
||||
if (events & (COMEDI_CB_EOA | COMEDI_CB_ERROR | COMEDI_CB_OVERFLOW))
|
||||
s->cancel(dev, s);
|
||||
|
||||
comedi_event(dev, s);
|
||||
|
||||
return events;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(cfc_handle_events);
|
||||
|
||||
static int __init comedi_fc_init_module(void)
|
||||
{
|
||||
return 0;
|
||||
|
|
|
@ -53,8 +53,11 @@ static inline unsigned int cfc_write_long_to_buffer(struct comedi_subdevice *s,
|
|||
unsigned int cfc_read_array_from_buffer(struct comedi_subdevice *,
|
||||
void *data, unsigned int num_bytes);
|
||||
|
||||
unsigned int cfc_handle_events(struct comedi_device *,
|
||||
struct comedi_subdevice *);
|
||||
static inline unsigned int cfc_handle_events(struct comedi_device *dev,
|
||||
struct comedi_subdevice *s)
|
||||
{
|
||||
return comedi_handle_events(dev, s);
|
||||
}
|
||||
|
||||
/**
|
||||
* cfc_check_trigger_src() - trivially validate a comedi_cmd trigger source
|
||||
|
|
Loading…
Reference in a new issue