Re: [PATCH] alps: Non interleaved V2 dualpoint has separate stick button bits

[Dmitry Torokhov <dmitry.torokhov@gmail.com>]

On Wed, Apr 08, 2015 at 06:04:52PM +0200, Hans de Goede wrote:
> Non interleaved V2 dualpoint touchpad / stick combos have separate stick
> button bits in the touchpad packets, if we do not check these then the
> trackpoint buttons will not work when using the touchpad, and when pressed
> when the user starts using the touchpad will report a release event even
> though the button is still pressed.
> 
> This commit fixes this by checking the separate bits, note that we simply
> combine the buttons, since the hardware does the same when using the touchpad
> buttons with the trackpoint, so we do not have enough information to properly
> separate them.

Hmm, if they are designated as trackstick buttons why don't we report
them as such (i.e. send button events out of dev2 without movement)?

Also, should we make note of this in alps.txt?

Thanks!

> 
> Reported-by: Hans de Bruin <jmdebruin@xmsnet.nl>
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
> ---
>  drivers/input/mouse/alps.c | 8 ++++++++
>  1 file changed, 8 insertions(+)
> 
> diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
> index 6962c26..58987b5 100644
> --- a/drivers/input/mouse/alps.c
> +++ b/drivers/input/mouse/alps.c
> @@ -243,6 +243,14 @@ static void alps_process_packet_v1_v2(struct psmouse *psmouse)
>  		return;
>  	}
>  
> +	/* Non interleaved V2 dualpoint has separate stick button bits */
> +	if (priv->proto_version == ALPS_PROTO_V2 &&
> +	    priv->flags == (ALPS_PASS | ALPS_DUALPOINT)) {
> +		left |= packet[0] & 1;
> +		right |= packet[0] & 2;
> +		middle |= packet[0] & 4;
> +	}
> +
>  	alps_report_buttons(dev, dev2, left, right, middle);
>  
>  	/* Convert hardware tap to a reasonable Z value */
> -- 
> 2.3.4
> 

-- 
Dmitry