From: Frank Mori Hess <fmhess@speakeasy.net>
Date: Fri, 8 Sep 2006 15:41:05 +0000 (+0000)
Subject: sync with comedi
X-Git-Tag: v0_8_0~57
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fe9d8704c2e6dee910089e9fd7547879c7459a4b;p=comedilib.git

sync with comedi
---

diff --git a/include/comedi.h b/include/comedi.h
index 698ad1e..63707b5 100644
--- a/include/comedi.h
+++ b/include/comedi.h
@@ -180,6 +180,7 @@ typedef unsigned short sampl_t;
 #define SDF_MODE3	0x0400		/* can do mode 3 */
 #define SDF_MODE4	0x0800		/* can do mode 4 */
 #define SDF_CMD		0x1000		/* can do commands */
+#define SDF_SOFT_CALIBRATED	0x2000	/* subdevice uses software calibration */
 
 #define SDF_READABLE	0x00010000	/* subdevice can be read (e.g. analog input) */
 #define SDF_WRITABLE	0x00020000	/* subdevice can be written (e.g. analog output) */
@@ -238,6 +239,7 @@ enum configuration_ids
 	INSN_CONFIG_BIDIRECTIONAL_DATA = 27,
 	INSN_CONFIG_DIO_QUERY = 28,
 	INSN_CONFIG_PWM_OUTPUT = 29,
+	INSN_CONFIG_GET_PWM_OUTPUT = 30,
 	INSN_CONFIG_GPCT_SINGLE_PULSE_GENERATOR = 1001, // Use CTR as single pulsegenerator
 	INSN_CONFIG_GPCT_PULSE_TRAIN_GENERATOR = 1002, // Use CTR as pulsetraingenerator
 	INSN_CONFIG_GPCT_QUADRATURE_ENCODER = 1003, // Use the counter as encoder
@@ -456,7 +458,7 @@ struct comedi_bufinfo_struct{
 // X2 encoding
 #define GPCT_X2                 0x02
 // X3 encoding
-#define GPCT_X4                 0x04 
+#define GPCT_X4                 0x04
 // When to take into account the indexpulse:
 #define GPCT_IndexPhaseHighHigh 0
 #define GPCT_IndexPhaseLowHigh 1