From: Frank Mori Hess <fmhess@speakeasy.net>
Date: Fri, 28 Sep 2007 19:02:02 +0000 (+0000)
Subject: Sync with comedi.
X-Git-Tag: r0_8_1~11
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=e8ad2b3498bbb0511b10b3c39b3e403819d93a9c;p=comedilib.git

Sync with comedi.
---

diff --git a/include/comedi.h b/include/comedi.h
index 4f7a695..d9b5920 100644
--- a/include/comedi.h
+++ b/include/comedi.h
@@ -762,6 +762,18 @@ static inline unsigned NI_PFI_OUTPUT_RTSI(unsigned rtsi_channel)
 	return NI_PFI_OUTPUT_RTSI0 + rtsi_channel;
 }
 
+/* Signals which can be routed to output on a NI PFI pin on a 660x board
+ with INSN_CONFIG_SET_ROUTING.  The numbers assigned are
+ not arbitrary, they correspond to the bits required
+ to program the board.  Lines 0 to 7 can only be set to
+ NI_660X_PFI_OUTPUT_DIO.  Lines 32 to 39 can only be set to
+ NI_660X_PFI_OUTPUT_COUNTER. */
+enum ni_660x_pfi_routing
+{
+	NI_660X_PFI_OUTPUT_COUNTER = 1,	// counter
+	NI_660X_PFI_OUTPUT_DIO = 2,	// static digital output
+};
+
 /* NI External Trigger lines.  These values are not arbitrary, but are related to
 	the bits required to program the board (offset by 1 for historical reasons). */
 static inline unsigned NI_EXT_PFI(unsigned pfi_channel)