On Wed, Mar 23, 2011 at 02:57:51PM -0700, Ping Cheng wrote:
> Don't assume the last tool was a pad, which confuses those tools
> that never receive a serial number. Keep PAD on the PAD_CHANNEL.
>
> Signed-off-by: Ping Cheng <[email protected]>
merged, thanks.
Cheers,
Peter
> ---
> src/wcmUSB.c | 21 ++++-----------------
> 1 files changed, 4 insertions(+), 17 deletions(-)
>
> diff --git a/src/wcmUSB.c b/src/wcmUSB.c
> index d58a740..5f0dbe2 100644
> --- a/src/wcmUSB.c
> +++ b/src/wcmUSB.c
> @@ -414,34 +414,21 @@ static void usbInitProtocol4(WacomCommonPtr common,
> const char* id,
>
> /* Initialize fixed PAD channel's state to in proximity.
> *
> - * Conceptionally, the PAD device is always in proximity and it's safe
> - * to initialize this one time up front; even for devices that have no PAD/
> - * pad buttons.
> - *
> * Some, but not all, Wacom protocol 4/5 devices are always in proximity.
> * Because of evdev filtering, there will never be a BTN_TOOL_FINGER
> * sent to initialize state.
> * Generic protocol devices never send anything to help initialize PAD
> * device as well.
> - * This helps those 2 cases and does not hurt the cases were kernel
> - * driver sends out-of-proximity event for PAD.
> + * This helps those 2 cases and does not hurt the cases where kernel
> + * driver sends out-of-proximity event for PAD since PAD is always on
> + * its own channel, PAD_CHANNEL.
> */
> static void usbWcmInitPadState(InputInfoPtr pInfo)
> {
> WacomDevicePtr priv = (WacomDevicePtr)pInfo->private;
> WacomCommonPtr common = priv->common;
> - wcmUSBData* private = common->private;
> WacomDeviceState *ds;
> - int channel;
> -
> - if (common->wcmProtocolLevel == WCM_PROTOCOL_5)
> - private->wcmLastToolSerial = -1;
> - else
> - private->wcmLastToolSerial = 0xf0;
> -
> - channel = usbChooseChannel(common);
> -
> - channel = private->wcmBTNChannel;
> + int channel = PAD_CHANNEL;
>
> DBG(6, common, "Initializing PAD channel %d\n", channel);
>
> --
> 1.7.4
------------------------------------------------------------------------------
Enable your software for Intel(R) Active Management Technology to meet the
growing manageability and security demands of your customers. Businesses
are taking advantage of Intel(R) vPro (TM) technology - will your software
be a part of the solution? Download the Intel(R) Manageability Checker
today! http://p.sf.net/sfu/intel-dev2devmar
_______________________________________________
Linuxwacom-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
