On Wed, Dec 6, 2017 at 9:00 AM, Aaron Armstrong Skomra <sko...@gmail.com>
wrote:
>
>
> On Wed, Dec 6, 2017 at 7:38 AM, Jason Gerecke <killert...@gmail.com>
> wrote:
>
>> On Tue, Dec 5, 2017 at 2:15 PM, Ping Cheng <pingli...@gmail.com> wrote:
>> > Yeah, puck’s feature is pretty much replaced by MT’s...
>> >
>> > On Tuesday, December 5, 2017, Aaron Armstrong Skomra <sko...@gmail.com>
>> > wrote:
>> >>
>> >> Signed-off-by: Aaron Armstrong Skomra <aaron.sko...@wacom.com>
>> >
>> >
>> > Reviewed-by: Ping Cheng <ping.ch...@wacom.com>
>> >
>> > Ping
>> >
>>
>> I notice that although the buttons don't work (making the puck
>> useless), the pointer itself still moves. Should this patch also
>> update the "don't report events for invalid data" block of
>> wacom_intuos_general() to completely ignore the puck for INTUOSP2?
>> Something similar for the generic codepath/upstream would be good as
>> well, but that's a different patch.
>>
>> Hmm, I was thinking of this as a "don't report the capability" patch, in
> the case where software looks
> at what the device supports. I hadn't thought of stopping bad data. If we
> want to stop people from using
> the wrong tool on a device I see there is a lot more work to be done... I
> know the 8k pen will report
>
Ok, let's defer this patch for now. I'd like that we update upstream first
before getting into input-wacom fixes...
Cheers,
Ping
> garbage data on Cobra Refresh.
>
> 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....
>>
>> >>
>> >> ---
>> >> 2.6.30/wacom_wac.c | 17 ++++++++++-------
>> >> 2.6.36/wacom_wac.c | 17 ++++++++++-------
>> >> 2.6.38/wacom_wac.c | 17 ++++++++++-------
>> >> 3.7/wacom_wac.c | 17 ++++++++++-------
>> >> 4 files changed, 40 insertions(+), 28 deletions(-)
>> >>
>> >> diff --git a/2.6.30/wacom_wac.c b/2.6.30/wacom_wac.c
>> >> index 3020ade403a7..aa6c6d279343 100644
>> >> --- a/2.6.30/wacom_wac.c
>> >> +++ b/2.6.30/wacom_wac.c
>> >> @@ -1875,18 +1875,21 @@ static void wacom_setup_cintiq(struct wacom_wac
>> >> *wacom_wac)
>> >> static void wacom_setup_intuos(struct wacom_wac *wacom_wac)
>> >> {
>> >> struct input_dev *input_dev = wacom_wac->input;
>> >> + struct wacom_features *features = &wacom_wac->features;
>> >>
>> >> input_set_capability(input_dev, EV_REL, REL_WHEEL);
>> >>
>> >> wacom_setup_cintiq(wacom_wac);
>> >>
>> >> - __set_bit(BTN_LEFT, input_dev->keybit);
>> >> - __set_bit(BTN_RIGHT, input_dev->keybit);
>> >> - __set_bit(BTN_MIDDLE, input_dev->keybit);
>> >> - __set_bit(BTN_SIDE, input_dev->keybit);
>> >> - __set_bit(BTN_EXTRA, input_dev->keybit);
>> >> - __set_bit(BTN_TOOL_MOUSE, input_dev->keybit);
>> >> - __set_bit(BTN_TOOL_LENS, input_dev->keybit);
>> >> + if (features->type != INTUOSP2) {
>> >> + __set_bit(BTN_LEFT, input_dev->keybit);
>> >> + __set_bit(BTN_RIGHT, input_dev->keybit);
>> >> + __set_bit(BTN_MIDDLE, input_dev->keybit);
>> >> + __set_bit(BTN_SIDE, input_dev->keybit);
>> >> + __set_bit(BTN_EXTRA, input_dev->keybit);
>> >> + __set_bit(BTN_TOOL_MOUSE, input_dev->keybit);
>> >> + __set_bit(BTN_TOOL_LENS, input_dev->keybit);
>> >> + }
>> >>
>> >> input_set_abs_params(input_dev, ABS_RZ, -900, 899, 0, 0);
>> >> input_set_abs_params(input_dev, ABS_THROTTLE, -1023, 1023, 0,
>> 0);
>> >> diff --git a/2.6.36/wacom_wac.c b/2.6.36/wacom_wac.c
>> >> index 54432390e13f..640c61e8b295 100644
>> >> --- a/2.6.36/wacom_wac.c
>> >> +++ b/2.6.36/wacom_wac.c
>> >> @@ -1704,18 +1704,21 @@ static void wacom_setup_cintiq(struct wacom_wac
>> >> *wacom_wac)
>> >> static void wacom_setup_intuos(struct wacom_wac *wacom_wac)
>> >> {
>> >> struct input_dev *input_dev = wacom_wac->input;
>> >> + struct wacom_features *features = &wacom_wac->features;
>> >>
>> >> input_set_capability(input_dev, EV_REL, REL_WHEEL);
>> >>
>> >> wacom_setup_cintiq(wacom_wac);
>> >>
>> >> - __set_bit(BTN_LEFT, input_dev->keybit);
>> >> - __set_bit(BTN_RIGHT, input_dev->keybit);
>> >> - __set_bit(BTN_MIDDLE, input_dev->keybit);
>> >> - __set_bit(BTN_SIDE, input_dev->keybit);
>> >> - __set_bit(BTN_EXTRA, input_dev->keybit);
>> >> - __set_bit(BTN_TOOL_MOUSE, input_dev->keybit);
>> >> - __set_bit(BTN_TOOL_LENS, input_dev->keybit);
>> >> + if (features->type != INTUOSP2) {
>> >> + __set_bit(BTN_LEFT, input_dev->keybit);
>> >> + __set_bit(BTN_RIGHT, input_dev->keybit);
>> >> + __set_bit(BTN_MIDDLE, input_dev->keybit);
>> >> + __set_bit(BTN_SIDE, input_dev->keybit);
>> >> + __set_bit(BTN_EXTRA, input_dev->keybit);
>> >> + __set_bit(BTN_TOOL_MOUSE, input_dev->keybit);
>> >> + __set_bit(BTN_TOOL_LENS, input_dev->keybit);
>> >> + }
>> >>
>> >> input_set_abs_params(input_dev, ABS_RZ, -900, 899, 0, 0);
>> >> input_set_abs_params(input_dev, ABS_THROTTLE, -1023, 1023, 0,
>> 0);
>> >> diff --git a/2.6.38/wacom_wac.c b/2.6.38/wacom_wac.c
>> >> index 3db445f6fbcd..7809c5904325 100644
>> >> --- a/2.6.38/wacom_wac.c
>> >> +++ b/2.6.38/wacom_wac.c
>> >> @@ -2139,18 +2139,21 @@ static void wacom_setup_cintiq(struct wacom_wac
>> >> *wacom_wac)
>> >> static void wacom_setup_intuos(struct wacom_wac *wacom_wac)
>> >> {
>> >> struct input_dev *input_dev = wacom_wac->input;
>> >> + struct wacom_features *features = &wacom_wac->features;
>> >>
>> >> input_set_capability(input_dev, EV_REL, REL_WHEEL);
>> >>
>> >> wacom_setup_cintiq(wacom_wac);
>> >>
>> >> - __set_bit(BTN_LEFT, input_dev->keybit);
>> >> - __set_bit(BTN_RIGHT, input_dev->keybit);
>> >> - __set_bit(BTN_MIDDLE, input_dev->keybit);
>> >> - __set_bit(BTN_SIDE, input_dev->keybit);
>> >> - __set_bit(BTN_EXTRA, input_dev->keybit);
>> >> - __set_bit(BTN_TOOL_MOUSE, input_dev->keybit);
>> >> - __set_bit(BTN_TOOL_LENS, input_dev->keybit);
>> >> + if (features->type != INTUOSP2) {
>> >> + __set_bit(BTN_LEFT, input_dev->keybit);
>> >> + __set_bit(BTN_RIGHT, input_dev->keybit);
>> >> + __set_bit(BTN_MIDDLE, input_dev->keybit);
>> >> + __set_bit(BTN_SIDE, input_dev->keybit);
>> >> + __set_bit(BTN_EXTRA, input_dev->keybit);
>> >> + __set_bit(BTN_TOOL_MOUSE, input_dev->keybit);
>> >> + __set_bit(BTN_TOOL_LENS, input_dev->keybit);
>> >> + }
>> >>
>> >> input_set_abs_params(input_dev, ABS_RZ, -900, 899, 0, 0);
>> >> input_set_abs_params(input_dev, ABS_THROTTLE, -1023, 1023, 0,
>> 0);
>> >> diff --git a/3.7/wacom_wac.c b/3.7/wacom_wac.c
>> >> index df557623027d..d707a97e08e4 100644
>> >> --- a/3.7/wacom_wac.c
>> >> +++ b/3.7/wacom_wac.c
>> >> @@ -2121,18 +2121,21 @@ static void wacom_setup_cintiq(struct wacom_wac
>> >> *wacom_wac)
>> >> static void wacom_setup_intuos(struct wacom_wac *wacom_wac)
>> >> {
>> >> struct input_dev *input_dev = wacom_wac->input;
>> >> + struct wacom_features *features = &wacom_wac->features;
>> >>
>> >> input_set_capability(input_dev, EV_REL, REL_WHEEL);
>> >>
>> >> wacom_setup_cintiq(wacom_wac);
>> >>
>> >> - __set_bit(BTN_LEFT, input_dev->keybit);
>> >> - __set_bit(BTN_RIGHT, input_dev->keybit);
>> >> - __set_bit(BTN_MIDDLE, input_dev->keybit);
>> >> - __set_bit(BTN_SIDE, input_dev->keybit);
>> >> - __set_bit(BTN_EXTRA, input_dev->keybit);
>> >> - __set_bit(BTN_TOOL_MOUSE, input_dev->keybit);
>> >> - __set_bit(BTN_TOOL_LENS, input_dev->keybit);
>> >> + if (features->type != INTUOSP2) {
>> >> + __set_bit(BTN_LEFT, input_dev->keybit);
>> >> + __set_bit(BTN_RIGHT, input_dev->keybit);
>> >> + __set_bit(BTN_MIDDLE, input_dev->keybit);
>> >> + __set_bit(BTN_SIDE, input_dev->keybit);
>> >> + __set_bit(BTN_EXTRA, input_dev->keybit);
>> >> + __set_bit(BTN_TOOL_MOUSE, input_dev->keybit);
>> >> + __set_bit(BTN_TOOL_LENS, input_dev->keybit);
>> >> + }
>> >>
>> >> input_set_abs_params(input_dev, ABS_RZ, -900, 899, 0, 0);
>> >> input_set_abs_params(input_dev, ABS_THROTTLE, -1023, 1023, 0,
>> 0);
>> >> --
>> >> 2.7.4
>> >>
>> >
>>
>
>
------------------------------------------------------------------------------
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
