staging: comedi: add CMDF_ROUND_... as synonyms for TRIG_ROUND_...

The `TRIG_ROUND_...` macros are some of the values that can be OR-ed
into the `flags` member of `struct comedi_cmd`.  They may influence the
rounding of sample timings during operation of the asynchronous command.

The names are a bit of a left-over from earlier times.  It would be
better to use the names `CMDF_ROUND_...` to match various other command
flags.

Define `CMDF_ROUND_MASK`, `CMDF_ROUND_NEAREST`, `CMDF_ROUND_DOWN`,
`CMDF_ROUND_UP` and `CMDF_ROUND_UP_NEXT` with the same numeric values as
`TRIG_ROUND_MASK`, `TRIG_ROUND_NEAREST`, `TRIG_ROUND_DOWN`,
`TRIG_ROUND_UP` and `TRIG_ROUND_UP_NEXT`, and redefine the
`TRIG_ROUND_...` macros as synonyms of the `CMDF_ROUND_...` macros.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/comedi/comedi.h b/drivers/staging/comedi/comedi.h
index 3d2801d8c520ece540555423f5a1020b5dac2251..c8c99e65423b2a3a46c231a36e2bafc0a979d38b 100644 (file)
--- a/drivers/staging/comedi/comedi.h
+++ b/drivers/staging/comedi/comedi.h
@@ -142,23 +142,29 @@
 
 #define CMDF_RAWDATA           0x00000080
 
+/* timer rounding definitions */
+#define CMDF_ROUND_MASK                0x00030000
+#define CMDF_ROUND_NEAREST     0x00000000
+#define CMDF_ROUND_DOWN                0x00010000
+#define CMDF_ROUND_UP          0x00020000
+#define CMDF_ROUND_UP_NEXT     0x00030000
+
 #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
-#define TRIG_ROUND_UP          0x00020000
-#define TRIG_ROUND_UP_NEXT     0x00030000
-
 /* compatibility definitions */
 #define TRIG_BOGUS             CMDF_BOGUS
 #define TRIG_RT                        CMDF_PRIORITY
 #define TRIG_WAKE_EOS          CMDF_WAKE_EOS
 #define TRIG_WRITE             CMDF_WRITE
+#define TRIG_ROUND_MASK                CMDF_ROUND_MASK
+#define TRIG_ROUND_NEAREST     CMDF_ROUND_NEAREST
+#define TRIG_ROUND_DOWN                CMDF_ROUND_DOWN
+#define TRIG_ROUND_UP          CMDF_ROUND_UP
+#define TRIG_ROUND_UP_NEXT     CMDF_ROUND_UP_NEXT
 
 /* trigger sources */