Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

authored by

Spencer E. Olson and committed by
Greg Kroah-Hartman
5c53440d 5cf79371

+9 -8
+9 -8
drivers/staging/comedi/comedi.h
··· 1104 1104 enum ni_gpct_arm_source { 1105 1105 NI_GPCT_ARM_IMMEDIATE = 0x0, 1106 1106 /* 1107 - * Start both the counter and the adjacent pared 1108 - * counter simultaneously 1107 + * Start both the counter and the adjacent paired counter simultaneously 1109 1108 */ 1110 1109 NI_GPCT_ARM_PAIRED_IMMEDIATE = 0x1, 1111 1110 /* 1112 - * NI doesn't document bits for selecting hardware arm triggers. 1113 - * If the NI_GPCT_ARM_UNKNOWN bit is set, we will pass the least 1114 - * significant bits (3 bits for 660x or 5 bits for m-series) 1115 - * through to the hardware. This will at least allow someone to 1116 - * figure out what the bits do later. 1111 + * If the NI_GPCT_HW_ARM bit is set, we will pass the least significant 1112 + * bits (3 bits for 660x or 5 bits for m-series) through to the 1113 + * hardware. To select a hardware trigger, pass the appropriate select 1114 + * bit, e.g., 1115 + * NI_GPCT_HW_ARM | NI_GPCT_AI_START1_GATE_SELECT or 1116 + * NI_GPCT_HW_ARM | NI_GPCT_PFI_GATE_SELECT(pfi_number) 1117 1117 */ 1118 - NI_GPCT_ARM_UNKNOWN = 0x1000, 1118 + NI_GPCT_HW_ARM = 0x1000, 1119 + NI_GPCT_ARM_UNKNOWN = NI_GPCT_HW_ARM, /* for backward compatibility */ 1119 1120 }; 1120 1121 1121 1122 /* digital filtering options for ni 660x for use with INSN_CONFIG_FILTER. */