On Thu, Sep 6, 2012 at 3:53 PM, Jason Gerecke <killertofu@xxxxxxxxx> wrote:
> The ability to set the proximity flag should apply to any device
> that has both pen and touch input. Rather than listing classes of
> devices known to meet this criteria, simply filter on the quirk
> defining all such devices.
>
> Signed-off-by: Jason Gerecke <killertofu@xxxxxxxxx>
Tested-by: Ping Cheng <pingc@xxxxxxxxx> for the whole set.
Dmitry, do you have questions about this patchset and "input: wacom:
Report correct touch contact size for I5/Bamboo"? We hope they can be
merged soon since we have more patches coming.
Thank you.
Ping
> ---
> drivers/input/tablet/wacom_wac.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c
> index 532d067..a8bc6c9 100644
> --- a/drivers/input/tablet/wacom_wac.c
> +++ b/drivers/input/tablet/wacom_wac.c
> @@ -326,7 +326,7 @@ static int wacom_intuos_inout(struct wacom_wac *wacom)
>
> /* Enter report */
> if ((data[1] & 0xfc) == 0xc0) {
> - if (features->type >= INTUOS5S && features->type <= INTUOS5L)
> + if (features->quirks == WACOM_QUIRK_MULTI_INPUT)
> wacom->shared->stylus_in_proximity = true;
>
> /* serial number of the tool */
> @@ -414,7 +414,7 @@ static int wacom_intuos_inout(struct wacom_wac *wacom)
>
> /* Exit report */
> if ((data[1] & 0xfe) == 0x80) {
> - if (features->type >= INTUOS5S && features->type <= INTUOS5L)
> + if (features->quirks == WACOM_QUIRK_MULTI_INPUT)
> wacom->shared->stylus_in_proximity = false;
>
> /*
> --
> 1.7.12
>
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
