Re: [PATCH v2 01/13] input: move MT_TOOL_* to input-event-codes.h

From: Dmitry Torokhov
Date: Mon Jun 11 2018 - 13:16:26 EST


Hi Benjamin,

On Thu, Jun 07, 2018 at 09:54:36AM +0200, Benjamin Tissoires wrote:
> This is evdev API and should be in this file.

This is a weak argument. include/uapi/linux/input.h is exclusively evdev
API as well. input-event-codes.h is simply evdev API that is usable in
device tree files, and I do not think that at this time we need to
expose tool types to device tree...

Thanks.

>
> Signed-off-by: Benjamin Tissoires <benjamin.tissoires@xxxxxxxxxx>
>
> ---
>
> new in v2
> ---
> include/uapi/linux/input-event-codes.h | 8 ++++++++
> include/uapi/linux/input.h | 8 --------
> 2 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/include/uapi/linux/input-event-codes.h b/include/uapi/linux/input-event-codes.h
> index 6cba8a21ea19..e8841cdb1ebd 100644
> --- a/include/uapi/linux/input-event-codes.h
> +++ b/include/uapi/linux/input-event-codes.h
> @@ -848,4 +848,12 @@
> #define SND_MAX 0x07
> #define SND_CNT (SND_MAX+1)
>
> +/*
> + * MT_TOOL types
> + */
> +#define MT_TOOL_FINGER 0
> +#define MT_TOOL_PEN 1
> +#define MT_TOOL_PALM 2
> +#define MT_TOOL_MAX 2
> +
> #endif
> diff --git a/include/uapi/linux/input.h b/include/uapi/linux/input.h
> index 7288a7c573cc..cc55c140dfef 100644
> --- a/include/uapi/linux/input.h
> +++ b/include/uapi/linux/input.h
> @@ -267,14 +267,6 @@ struct input_mask {
> #define BUS_CEC 0x1E
> #define BUS_INTEL_ISHTP 0x1F
>
> -/*
> - * MT_TOOL types
> - */
> -#define MT_TOOL_FINGER 0
> -#define MT_TOOL_PEN 1
> -#define MT_TOOL_PALM 2
> -#define MT_TOOL_MAX 2
> -
> /*
> * Values describing the status of a force-feedback effect
> */
> --
> 2.14.3
>

--
Dmitry