Re: [PATCH 44/51] Input: atmel_mxt_ts - Handle reports from T47Stylus object

[rydberg]

On Thu, Jun 27, 2013 at 01:49:19PM +0100, Nick Dyer wrote:
> Signed-off-by: Nick Dyer <nick.dyer@xxxxxxxxxxx>
> Acked-by: Benson Leung <bleung@xxxxxxxxxxxx>
> ---
>  drivers/input/touchscreen/atmel_mxt_ts.c |   16 +++++++++++++++-
>  1 file changed, 15 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c
> index ee39683..ceb090a 100644
> --- a/drivers/input/touchscreen/atmel_mxt_ts.c
> +++ b/drivers/input/touchscreen/atmel_mxt_ts.c
> @@ -128,6 +128,9 @@ struct t9_range {
>  /* Define for MXT_PROCI_TOUCHSUPPRESSION_T42 */
>  #define MXT_T42_MSG_TCHSUP	(1 << 0)
>  
> +/* T47 Stylus */
> +#define MXT_TOUCH_MAJOR_T47_STYLUS	1
> +

Ok - normally, creating dummy values is not recommended, but for the
shared touch/stylys implementation there is obviously no alternative.

>  /* T63 Stylus */
>  #define MXT_T63_STYLUS_PRESS	(1 << 0)
>  #define MXT_T63_STYLUS_RELEASE	(1 << 1)
> @@ -696,6 +699,7 @@ static void mxt_proc_t9_message(struct mxt_data *data, u8 *message)
>  	int area;
>  	int amplitude;
>  	u8 vector;
> +	int tool;
>  
>  	/* do not report events if input device not yet registered */
>  	if (!data->enable_reporting)
> @@ -713,6 +717,7 @@ static void mxt_proc_t9_message(struct mxt_data *data, u8 *message)
>  		y >>= 2;
>  
>  	area = message[5];
> +
>  	amplitude = message[6];
>  	vector = message[7];
>  
> @@ -741,8 +746,17 @@ static void mxt_proc_t9_message(struct mxt_data *data, u8 *message)
>  			mxt_input_sync(input_dev);
>  		}
>  
> +		/* A reported size of zero indicates that the reported touch
> +		 * is a stylus from a linked Stylus T47 object. */
> +		if (area == 0) {
> +			area = MXT_TOUCH_MAJOR_T47_STYLUS;
> +			tool = MT_TOOL_PEN;
> +		} else {
> +			tool = MT_TOOL_FINGER;
> +		}
> +
>  		/* Touch active */
> -		input_mt_report_slot_state(input_dev, MT_TOOL_FINGER, 1);
> +		input_mt_report_slot_state(input_dev, tool, 1);
>  		input_report_abs(input_dev, ABS_MT_POSITION_X, x);
>  		input_report_abs(input_dev, ABS_MT_POSITION_Y, y);
>  		input_report_abs(input_dev, ABS_MT_PRESSURE, amplitude);
> -- 
> 1.7.10.4
> 

    Reviewed-by: Henrik Rydberg <rydberg@xxxxxxxxxxx>

Thanks,
Henrik
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/