lkml.org 
[lkml]   [2019]   [Jun]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 05/75] HID: wacom: Dont report anything prior to the tool entering range
    Date
    From: Jason Gerecke <jason.gerecke@wacom.com>

    commit e92a7be7fe5b2510fa60965eaf25f9e3dc08b8cc upstream.

    If the tool spends some time in prox before entering range, a series of
    events (e.g. ABS_DISTANCE, MSC_SERIAL) can be sent before we or userspace
    have any clue about the pen whose data is being reported. We need to hold
    off on reporting anything until the pen has entered range. Since we still
    want to report events that occur "in prox" after the pen has *left* range
    we use 'wacom-tool[0]' as the indicator that the pen did at one point
    enter range and provide us/userspace with tool type and serial number
    information.

    Fixes: a48324de6d4d ("HID: wacom: Bluetooth IRQ for Intuos Pro should handle prox/range")
    Cc: <stable@vger.kernel.org> # 4.11+
    Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
    Reviewed-by: Aaron Armstrong Skomra <aaron.skomra@wacom.com>
    Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/hid/wacom_wac.c | 33 ++++++++++++++++++---------------
    1 file changed, 18 insertions(+), 15 deletions(-)

    --- a/drivers/hid/wacom_wac.c
    +++ b/drivers/hid/wacom_wac.c
    @@ -1288,23 +1288,26 @@ static void wacom_intuos_pro2_bt_pen(str
    get_unaligned_le16(&frame[11]));
    }
    }
    - input_report_abs(pen_input, ABS_PRESSURE, get_unaligned_le16(&frame[5]));
    - if (wacom->features.type == INTUOSP2_BT) {
    - input_report_abs(pen_input, ABS_DISTANCE,
    - range ? frame[13] : wacom->features.distance_max);
    - } else {
    - input_report_abs(pen_input, ABS_DISTANCE,
    - range ? frame[7] : wacom->features.distance_max);
    - }

    - input_report_key(pen_input, BTN_TOUCH, frame[0] & 0x01);
    - input_report_key(pen_input, BTN_STYLUS, frame[0] & 0x02);
    - input_report_key(pen_input, BTN_STYLUS2, frame[0] & 0x04);
    + if (wacom->tool[0]) {
    + input_report_abs(pen_input, ABS_PRESSURE, get_unaligned_le16(&frame[5]));
    + if (wacom->features.type == INTUOSP2_BT) {
    + input_report_abs(pen_input, ABS_DISTANCE,
    + range ? frame[13] : wacom->features.distance_max);
    + } else {
    + input_report_abs(pen_input, ABS_DISTANCE,
    + range ? frame[7] : wacom->features.distance_max);
    + }
    +
    + input_report_key(pen_input, BTN_TOUCH, frame[0] & 0x01);
    + input_report_key(pen_input, BTN_STYLUS, frame[0] & 0x02);
    + input_report_key(pen_input, BTN_STYLUS2, frame[0] & 0x04);

    - input_report_key(pen_input, wacom->tool[0], prox);
    - input_event(pen_input, EV_MSC, MSC_SERIAL, wacom->serial[0]);
    - input_report_abs(pen_input, ABS_MISC,
    - wacom_intuos_id_mangle(wacom->id[0])); /* report tool id */
    + input_report_key(pen_input, wacom->tool[0], prox);
    + input_event(pen_input, EV_MSC, MSC_SERIAL, wacom->serial[0]);
    + input_report_abs(pen_input, ABS_MISC,
    + wacom_intuos_id_mangle(wacom->id[0])); /* report tool id */
    + }

    wacom->shared->stylus_in_proximity = prox;


    \
     
     \ /
      Last update: 2019-06-17 23:34    [W:4.107 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site