Re: [Linuxwacom-devel] [PATCH] Allow PAD only interfaces without EV_ABS and/or EV_X/Y to report events

[Jason G. <kil...@gm...>]

On Wed, Mar 18, 2015 at 4:22 PM, Ping Cheng <pin...@gm...> wrote:
> On Wed, Mar 18, 2015 at 3:22 PM, Benjamin Tissoires
> <ben...@gm...> wrote:
>> On Sun, Mar 15, 2015 at 10:01 PM, Peter Hutterer
>> <pet...@wh...> wrote:
>>> On Fri, Mar 13, 2015 at 11:24:27AM -0400, Benjamin Tissoires wrote:
>>>> commit 0cfe113 (Allow PAD only interface without setting up EV_ABS
>>>> and/or EV_X/Y) allows xf86-input-wacom to handle Pad only interface but
>>>> such interface do not report any events.
>>>>
>>>> We need to call usbWcmInitPadState() to be able to forward events.
>>>>
>>>> Signed-off-by: Benjamin Tissoires <ben...@re...>
>>>> ---
>>>>  src/wcmUSB.c | 5 +++--
>>>>  1 file changed, 3 insertions(+), 2 deletions(-)
>>>>
>>>> diff --git a/src/wcmUSB.c b/src/wcmUSB.c
>>>> index bac3c66..1efcb5b 100644
>>>> --- a/src/wcmUSB.c
>>>> +++ b/src/wcmUSB.c
>>>> @@ -549,7 +549,7 @@ int usbWcmGetRanges(InputInfoPtr pInfo)
>>>>               /* may be an expresskey only interface */
>>>>               if (ISBITSET(common->wcmKeys, BTN_FORWARD) ||
>>>>                   ISBITSET(common->wcmKeys, BTN_0))
>>>> -                     return Success;
>>>> +                     goto pad_init;
>>>>
>>>>               xf86Msg(X_ERROR, "%s: no abs bits.\n", pInfo->name);
>>>>               return !Success;
>>>> @@ -568,7 +568,7 @@ int usbWcmGetRanges(InputInfoPtr pInfo)
>>>>               /* may be a PAD only interface */
>>>>               if (ISBITSET(common->wcmKeys, BTN_FORWARD) ||
>>>>                   ISBITSET(common->wcmKeys, BTN_0))
>>>> -                     return Success;
>>>> +                     goto pad_init;
>>>>
>>>>               xf86Msg(X_ERROR, "%s: unable to ioctl xmax value.\n", pInfo->name);
>>>>               return !Success;
>>>> @@ -782,6 +782,7 @@ int usbWcmGetRanges(InputInfoPtr pInfo)
>>>>                       common->wcmHWTouchSwitchState = 1;
>>>>       }
>>>>
>>>> +pad_init:
>>>>       usbWcmInitPadState(pInfo);
>>>>
>>>>       return Success;
>>>> --
>>>> 2.3.1
>>>
>>> Acked-by: Peter Hutterer <pet...@wh...>
>
> Reviewed-by: Ping Cheng <pi...@wa...>
>
> Sorry for the delay...
>
> Ping

Apologies for my own delay; this has now been merged.

Jason
---
Now instead of four in the eights place /
you’ve got three, ‘Cause you added one  /
(That is to say, eight) to the two,     /
But you can’t take seven from three,    /
So you look at the sixty-fours....