On Mon, Dec 18, 2017 at 5:18 PM, Jason Gerecke <killert...@gmail.com> wrote:
> The 'wacom_setup_input_capabilities' function was backported in commit
> ee0d2bd259 but apparently not all cases of explicitly-set button events
> were removed. This finishes the cleanup.
>
> Fixes: ee0d2bd259 ("backport: HID: wacom: Set button bits based on a new
> numbered_buttons")
> Signed-off-by: Ping Cheng <ping.ch...@wacom.com>
> Signed-off-by: Jason Gerecke <jason.gere...@wacom.com>
> ---
> 2.6.30/wacom_wac.c | 25 -------------------------
> 1 file changed, 25 deletions(-)
>
> diff --git a/2.6.30/wacom_wac.c b/2.6.30/wacom_wac.c
> index 8e2269c..9bc9564 100644
> --- a/2.6.30/wacom_wac.c
> +++ b/2.6.30/wacom_wac.c
> @@ -2086,24 +2086,8 @@ void wacom_setup_input_capabilities(struct
> input_dev *input_dev,
> /* fall through */
>
> case WACOM_21UX2:
> - __set_bit(BTN_A, input_dev->keybit);
> - __set_bit(BTN_B, input_dev->keybit);
> - __set_bit(BTN_C, input_dev->keybit);
> - __set_bit(BTN_X, input_dev->keybit);
> - __set_bit(BTN_Y, input_dev->keybit);
> - __set_bit(BTN_Z, input_dev->keybit);
> - __set_bit(BTN_BASE, input_dev->keybit);
> - __set_bit(BTN_BASE2, input_dev->keybit);
> - /* fall through */
> -
> case WACOM_BEE:
> - __set_bit(BTN_8, input_dev->keybit);
> - __set_bit(BTN_9, input_dev->keybit);
> - /* fall through */
> -
> case CINTIQ:
> - for (i = 0; i < 8; i++)
> - __set_bit(BTN_0 + i, input_dev->keybit);
> __set_bit(BTN_TOOL_FINGER, input_dev->keybit);
>
> input_set_abs_params(input_dev, ABS_RX, 0, 4096, 0, 0);
> @@ -2142,18 +2126,9 @@ void wacom_setup_input_capabilities(struct
> input_dev *input_dev,
> case INTUOS5L:
> case INTUOSPM:
> case INTUOSPL:
> - if (features->device_type == BTN_TOOL_PEN) {
> - __set_bit(BTN_7, input_dev->keybit);
> - __set_bit(BTN_8, input_dev->keybit);
> - }
> - /* fall through */
> -
> case INTUOS5S:
> case INTUOSPS:
> if (features->device_type == BTN_TOOL_PEN) {
> - for (i = 0; i < 7; i++)
> - __set_bit(BTN_0 + i, input_dev->keybit);
> -
> input_set_abs_params(input_dev, ABS_DISTANCE, 0,
> features->distance_max,
> features->distance_fuzz, 0);
> --
> 2.15.1
>
> Tested on the 21UX2.
Aaron
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
