[PATCH] Extra buttons on Acer Ferrari 4000 laptop touchpad are not recognized

[Peter Hutterer]

On Fri, Sep 02, 2011 at 10:32:50AM -0700, Alan Coopersmith wrote:
> From: Casper Dik <casper.dik at oracle.com>
> 
> The code was checking for a value of exactly 1, while the Synaptics
> docs at http://www.synaptics.com/sites/default/files/511-000275-01rA.pdf
> say:
> 
>     Extended Model ID. This query returns the product ID, additional
>     capability bits, and additional bits to widen the infoSensor
>     field. infoSensor is a part of the Model ID query (query $03).
>     The Extended Model ID query is only present if nExtendedQueries
>     is *greater than* or equal to 1.
> 
> Signed-off-by: Casper Dik <casper.dik at oracle.com>
> Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
> ---
>  src/ps2comm.h |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/src/ps2comm.h b/src/ps2comm.h
> index 0f3795c..1b303ca 100644
> --- a/src/ps2comm.h
> +++ b/src/ps2comm.h
> @@ -74,7 +74,7 @@
>  #define SYN_CAP_MULTIFINGER(synhw)	((synhw)->capabilities & (1 << 1))
>  #define SYN_CAP_PALMDETECT(synhw)	((synhw)->capabilities & (1 << 0))
>  #define SYN_CAP_VALID(synhw)		((((synhw)->capabilities & 0x00ff00) >> 8) == 0x47)
> -#define SYN_EXT_CAP_REQUESTS(synhw)	(((synhw)->capabilities & 0x700000) == 0x100000)
> +#define SYN_EXT_CAP_REQUESTS(synhw)	(((synhw)->capabilities & 0x700000) != 0)
>  #define SYN_CAP_MULTI_BUTTON_NO(synhw)	(((synhw)->ext_cap & 0x00f000) >> 12)
>  
>  /* synaptics modes query bits */
> -- 
> 1.7.3.2

merged:
   bc789cc..ba981e2  master -> master

thanks.

Cheers,
  Peter