[PATCH xf86-input-mouse] Do not drop the result of protocol detection

[Michael Thayer]

No response on this yet.  Who would be the right person for looking at 
patches to xf86-input-mouse?  I do realise that it is no longer as 
widely used as it once was...

Regards,

Michael

On 31/03/14 11:21, Michael Thayer wrote:
> In MousePickProtocol() with protocol PROT_AUTO we probe for the protocol to
> use but drop the result in most cases.  This was causing DEVICE_INIT and
> DEVICE_ON to fail to be called with the VUID protocol.  Git history suggests
> that this code was originally meant to cover both PS/2 auto-detection and OS-
> specific detection, but that only the first case was implemented at the time.
> Now that only the second is needed dropping the result to keep the protocol
> as PROT_AUTO is presumably no longer useful and seems to actively breaking
> things.
> Signed-off-by: Michael Thayer <michael.thayer at oracle.com>
> ---
>   src/mouse.c |    7 ++-----
>   1 file changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/src/mouse.c b/src/mouse.c
> index 2da2b4d..ff8d799 100644
> --- a/src/mouse.c
> +++ b/src/mouse.c
> @@ -843,11 +843,8 @@ MousePickProtocol(InputInfoPtr pInfo, const char* device,
>       {
>           const char *osProt;
>           if (osInfo->SetupAuto && (osProt = osInfo->SetupAuto(pInfo,NULL))) {
> -            MouseProtocolID id = ProtocolNameToID(osProt);
> -            if (id == PROT_UNKNOWN || id == PROT_UNSUP) {
> -                protocolID = id;
> -                protocol = osProt;
> -            }
> +            protocolID = ProtocolNameToID(osProt);
> +            protocol = osProt;
>           }
>       }
>
>


-- 
ORACLE Deutschland B.V. & Co. KG   Michael Thayer
Werkstrasse 24                     VirtualBox engineering
71384 Weinstadt, Germany           mailto:michael.thayer at oracle.com

Hauptverwaltung: Riesstr. 25, D-80992 München
Registergericht: Amtsgericht München, HRA 95603
Geschäftsführer: Jürgen Kunz

Komplementärin: ORACLE Deutschland Verwaltung B.V.
Hertogswetering 163/167, 3543 AS Utrecht, Niederlande
Handelsregister der Handelskammer Midden-Niederlande, Nr. 30143697
Geschäftsführer: Alexander van der Ven, Astrid Kepper, Val Maher