staging: comedi: ni_mio_common: split out ao arming from ni_ao_inttrig

Browse source

AO device arming was previously done as a part of ni_ao_inttrig which is
called as a result of the user calling comedi_internal_trigger.  For
start_src == TRIG_EXT, this does not make very much sense since external
triggers should not conceptually need to be software triggered also.  This
patch splits out the arming functionality to allow arming to specifically
and separately be done via the CONFIG_INSN_ARM ioctl command.

In order to provide backwards compatibility, this patch also provides
automatic arming if ni_ao_inttrig is simply called.

Signed-off-by: Spencer E. Olson <olsonse@umich.edu>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

...

This commit is contained in:

Spencer E. Olson 2016-10-10 08:14:19 -06:00 • committed by Greg Kroah-Hartman

parent cc7a6d6c46

commit 1ffe8bdc09

2 changed files with 112 additions and 52 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

150

drivers/staging/comedi/drivers/ni_mio_common.c

View file

14

drivers/staging/comedi/drivers/ni_stc.h

View file