From: Ian Abbott Date: Wed, 3 Sep 2014 12:45:29 +0000 (+0100) Subject: staging: comedi: add CMDF_WAKE_EOS as synonym for TRIG_WAKE_EOS X-Git-Tag: v3.18-rc1~130^2~740 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3e15acd313d208651a1e8a0e9369a41b470b1893;p=karo-tx-linux.git staging: comedi: add CMDF_WAKE_EOS as synonym for TRIG_WAKE_EOS `TRIG_WAKE_EOS` is one of the values that can be OR-ed into the `flags` member of `struct comedi_cmd`. It's intended action is tune the asynchronous command to interrupt at the end of every "scan". The name is a bit of a left-over from earlier times. A better name would be `CMDF_WAKE_EOS` to match various other command flags. Define `CMDF_WAKE_EOS` with the same numeric value as the old `TRIG_WAKE_EOS` and redefine `TRIG_WAKE_EOS` as a synonym of it. Signed-off-by: Ian Abbott Reviewed-by: H Hartley Sweeten Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/comedi.h b/drivers/staging/comedi/comedi.h index 217baf812f87..dfaa935dd784 100644 --- a/drivers/staging/comedi/comedi.h +++ b/drivers/staging/comedi/comedi.h @@ -126,10 +126,7 @@ #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_CONFIG 0x0010 /* perform configuration, not triggering */ -#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 */ @@ -137,10 +134,10 @@ /* try to use a real-time interrupt while performing command */ #define CMDF_PRIORITY 0x00000008 -#define TRIG_RT CMDF_PRIORITY /* compatibility definition */ +/* wake up on end-of-scan events */ +#define CMDF_WAKE_EOS 0x00000020 #define CMDF_WRITE 0x00000040 -#define TRIG_WRITE CMDF_WRITE /* compatibility definition */ #define CMDF_RAWDATA 0x00000080 @@ -156,6 +153,11 @@ #define TRIG_ROUND_UP 0x00020000 #define TRIG_ROUND_UP_NEXT 0x00030000 +/* compatibility definitions */ +#define TRIG_RT CMDF_PRIORITY +#define TRIG_WAKE_EOS CMDF_WAKE_EOS +#define TRIG_WRITE CMDF_WRITE + /* trigger sources */ #define TRIG_ANY 0xffffffff