Commit 5c53440d authored by Spencer E. Olson's avatar Spencer E. Olson Committed by Greg Kroah-Hartman
Browse files

staging: comedi: porting NI_GPCT constants from comedi.org module 



Information pertaining to the NI_GPCT_ARM* registers were added to the
comedi.org version of the comedi kernel.  This adds this information to
the staging-tree version of the comedi kernel.  Relevant comments are also
copied over.

Signed-off-by: default avatarSpencer E. Olson <olsonse@umich.edu>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5cf79371

drivers/staging/comedi/comedi.h

+9 −8
Original line number Original line Diff line number Diff line
@@ -1104,18 +1104,19 @@ enum ni_gpct_other_select { 
enum ni_gpct_arm_source {

enum ni_gpct_arm_source {

	NI_GPCT_ARM_IMMEDIATE = 0x0,

	NI_GPCT_ARM_IMMEDIATE = 0x0,

	/*

	/*

	 * Start both the counter and the adjacent pared

	 * Start both the counter and the adjacent paired counter simultaneously

	 * counter simultaneously

	 */

	 */

	NI_GPCT_ARM_PAIRED_IMMEDIATE = 0x1,

	NI_GPCT_ARM_PAIRED_IMMEDIATE = 0x1,

	/*

	/*

	 * NI doesn't document bits for selecting hardware arm triggers.

	 * If the NI_GPCT_HW_ARM bit is set, we will pass the least significant

	 * If the NI_GPCT_ARM_UNKNOWN bit is set, we will pass the least

	 * bits (3 bits for 660x or 5 bits for m-series) through to the

	 * significant bits (3 bits for 660x or 5 bits for m-series)

	 * hardware. To select a hardware trigger, pass the appropriate select

	 * through to the hardware.  This will at least allow someone to

	 * bit, e.g.,

	 * figure out what the bits do later.

	 * NI_GPCT_HW_ARM | NI_GPCT_AI_START1_GATE_SELECT or

	 * NI_GPCT_HW_ARM | NI_GPCT_PFI_GATE_SELECT(pfi_number)

	 */

	 */

	NI_GPCT_ARM_UNKNOWN = 0x1000,

	NI_GPCT_HW_ARM = 0x1000,

	NI_GPCT_ARM_UNKNOWN = NI_GPCT_HW_ARM,	/* for backward compatibility */

};

};





/* digital filtering options for ni 660x for use with INSN_CONFIG_FILTER. */

/* digital filtering options for ni 660x for use with INSN_CONFIG_FILTER. */