Rearrange flags used for both cmd and trig. Added COMEDI_EV flags.

diff --git a/include/linux/comedi.h b/include/linux/comedi.h
index 07f937972b0e7806ea56c003f1d791d418e7a1f5..dbf4ce673fb1d603ca3c634975f86417b65f5a74 100644 (file)
--- a/include/linux/comedi.h
+++ b/include/linux/comedi.h
@@ -100,15 +100,30 @@ typedef unsigned short sampl_t;
 #define INSN_INTTRIG           ( 6 | INSN_MASK_WRITE|INSN_MASK_SPECIAL)
 
 /* trigger flags */
+/* These flags are used in comedi_trig structures */
 
 #define TRIG_BOGUS     0x0001          /* do the motions */
 #define TRIG_DITHER    0x0002          /* enable dithering */
 #define TRIG_DEGLITCH  0x0004          /* enable deglitching */
-#define TRIG_RT                0x0008          /* perform op in real time */
+//#define TRIG_RT      0x0008          /* perform op in real time */
 #define TRIG_CONFIG    0x0010          /* perform configuration, not triggering */
-#define TRIG_WAKE_EOS  0x0020          /* wake up on end-of-scan events */
+//#define TRIG_WAKE_EOS        0x0020          /* wake up on end-of-scan events */
 #define TRIG_WRITE     0x0040          /* write to bidirectional devices */
 
+/* command flags */
+/* These flags are used in comedi_cmd structures */
+
+#define CMDF_PRIORITY          0x00000008 /* try to use a real-time interrupt while performing command */
+
+#define TRIG_RT                CMDF_PRIORITY /* compatibility definition */
+#define TRIG_WAKE_EOS          0x00000020 /* legacy definition for COMEDI_EV_SCAN_END */
+
+#define COMEDI_EV_START                0x00040000
+#define COMEDI_EV_SCAN_BEGIN   0x00080000
+#define COMEDI_EV_CONVERT      0x00100000
+#define COMEDI_EV_SCAN_END     0x00200000
+#define COMEDI_EV_STOP         0x00400000
+
 #define TRIG_ROUND_MASK                0x00030000
 #define TRIG_ROUND_NEAREST     0x00000000
 #define TRIG_ROUND_DOWN                0x00010000