FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-28 12:25:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

staging: comedi: make constants slightly more consistent

Browse Source 
This makes INSN_CONFIG_DIO_{INPUT,OUTPUT,OPENDRAIN} simply be copies of the
already-existing constants COMEDI_INPUT, COMEDI_OUTPUT, and
COMEDI_OPENDRAIN.

This change also ensures that if a user happens to use, for example,
COMEDI_INPUT in place of where INSN_CONFIG_DIO_INPUT, the result will
always be the same and also acceptable and correct usage.

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-08 15:38:43 -06:00 committed by Greg Kroah-Hartman
parent 5c53440daa
commit cc7a6d6c46
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
drivers/staging/comedi/comedi.h
View File

@ -244,6 +244,22 @@ enum comedi_subdevice_type {
/* configuration instructions */
/**
* enum comedi_io_direction - COMEDI I/O directions
* @COMEDI_INPUT: Input.
* @COMEDI_OUTPUT: Output.
* @COMEDI_OPENDRAIN: Open-drain (or open-collector) output.
*
* These are used by the %INSN_CONFIG_DIO_QUERY configuration instruction to
* report a direction. They may also be used in other places where a direction
* needs to be specified.
*/
enum comedi_io_direction {
COMEDI_INPUT = 0,
COMEDI_OUTPUT = 1,
COMEDI_OPENDRAIN = 2
};
/**
* enum configuration_ids - COMEDI configuration instruction codes
* @INSN_CONFIG_DIO_INPUT: Configure digital I/O as input.
@ -296,9 +312,9 @@ enum comedi_subdevice_type {
* @INSN_CONFIG_PWM_GET_H_BRIDGE: Get PWM H bridge duty cycle and polarity.
*/
enum configuration_ids {
INSN_CONFIG_DIO_INPUT = 0,
INSN_CONFIG_DIO_OUTPUT = 1,
INSN_CONFIG_DIO_OPENDRAIN = 2,
INSN_CONFIG_DIO_INPUT = COMEDI_INPUT,
INSN_CONFIG_DIO_OUTPUT = COMEDI_OUTPUT,
INSN_CONFIG_DIO_OPENDRAIN = COMEDI_OPENDRAIN,
INSN_CONFIG_ANALOG_TRIG = 16,
/* INSN_CONFIG_WAVEFORM = 17, */
/* INSN_CONFIG_TRIG = 18, */
@ -396,22 +412,6 @@ enum comedi_digital_trig_op {
COMEDI_DIGITAL_TRIG_ENABLE_LEVELS = 2
};
/**
* enum comedi_io_direction - COMEDI I/O directions
* @COMEDI_INPUT: Input.
* @COMEDI_OUTPUT: Output.
* @COMEDI_OPENDRAIN: Open-drain (or open-collector) output.
*
* These are used by the %INSN_CONFIG_DIO_QUERY configuration instruction to
* report a direction. They may also be used in other places where a direction
* needs to be specified.
*/
enum comedi_io_direction {
COMEDI_INPUT = 0,
COMEDI_OUTPUT = 1,
COMEDI_OPENDRAIN = 2
};
/**
* enum comedi_support_level - support level for a COMEDI feature
* @COMEDI_UNKNOWN_SUPPORT: Unspecified support for feature.