From patchwork Thu Dec 8 00:19:29 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ping Cheng X-Patchwork-Id: 9465483 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 313BE60512 for ; Thu, 8 Dec 2016 00:19:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3D4E128533 for ; Thu, 8 Dec 2016 00:19:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2ECD5285A3; Thu, 8 Dec 2016 00:19:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1100428533 for ; Thu, 8 Dec 2016 00:19:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932752AbcLHATs (ORCPT ); Wed, 7 Dec 2016 19:19:48 -0500 Received: from mail-pf0-f195.google.com ([209.85.192.195]:36714 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932661AbcLHATr (ORCPT ); Wed, 7 Dec 2016 19:19:47 -0500 Received: by mail-pf0-f195.google.com with SMTP id c4so21254286pfb.3 for ; Wed, 07 Dec 2016 16:19:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=f/li324RHk1ZJkD29VTRhVT4aXPdYo3WYbgQJOu+lMU=; b=foEm3/xi6RXkyRzO8XMNjIK03uTh+6OstjIZgbukRgxq164jOSEQJzKLXx02hgxe9n TC611FdPeK/FACF5RV1sAAwGnWUEEETsd7NSgCEHZqKWsF8XDaHXoebwYn28oD8B1Tn9 0i8zktLCe6ZYHyESUQCDBbfCHgB2Xyqo4RIbAO+8LMADJF7nKiRMDHYhcX6DlwUSFeeh 66Ft8h7nqmBKC2L7kKaM5YRQ94gY8Bl0um67Grj4ADesAdmezpfcUCcJF91cPUZG+OEy BsHKQO2Y/aexf/2EWdvzaHpGEE/j+Eur1bOuUKwLpy0XkLbXkTWXJ/XiR0MAjMHQubJp THvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=f/li324RHk1ZJkD29VTRhVT4aXPdYo3WYbgQJOu+lMU=; b=UyQry7gTXciNUCuKXambeM4sCngEMiwxj94mTqGn+mzZUMHbvVswglBpb0WcOzrVLk 5lKNhiEfryS7Cx5zooKTTDNP85Y4LQSsDaAmkWnl6d5qQk1e3qi5qQ02WWT9E/MHq3uH pZEEjb3IfS72Kji/eQfUxdA6pLz/4QlvqQdNZA8tC9ZzVE/Ia2VkN7Kn7q/DwjCVkbDM Z90MK4StLzUZN1tVxbQbCjv85KpKc90YQb0BlqPAhVfBV6kICouusy0g0kiADRgXyuZT XipQktnBK4xtiCSHSCkYknF4H1BLv0EOxulIyG+tnr4KlbuUauQrz5R6b3iwASOO7bbV /m2Q== X-Gm-Message-State: AKaTC03Vohiro50UlmiKw6SkPyHKCV4Wt6o3yxtLo8NDNiE3oUO9m7l4ME4s/ElLnYnwMg== X-Received: by 10.99.50.67 with SMTP id y64mr126208212pgy.146.1481156386886; Wed, 07 Dec 2016 16:19:46 -0800 (PST) Received: from wacom-XPS-8500.corp.onewacom.com ([50.225.60.4]) by smtp.gmail.com with ESMTPSA id f3sm8417247pga.45.2016.12.07.16.19.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 07 Dec 2016 16:19:46 -0800 (PST) From: Ping Cheng X-Google-Original-From: Ping Cheng To: linux-input@vger.kernel.org Cc: jkosina@suse.cz, benjamin.tissoires@redhat.com, Ping Cheng , Ping Cheng Subject: [PATCH 4/4] HID: wacom: generic: Don't sync input on empty input packets Date: Wed, 7 Dec 2016 16:19:29 -0800 Message-Id: <1481156369-5403-1-git-send-email-pingc@wacom.com> X-Mailer: git-send-email 2.7.4 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP post input_sync only when there are input events posted Signed-off-by: Ping Cheng --- drivers/hid/wacom_wac.c | 86 +++++++++++++++++++++++++++++++++---------------- drivers/hid/wacom_wac.h | 1 + 2 files changed, 60 insertions(+), 27 deletions(-) diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c index 7a748a7..411ba2c 100644 --- a/drivers/hid/wacom_wac.c +++ b/drivers/hid/wacom_wac.c @@ -1591,18 +1591,13 @@ static void wacom_wac_pad_usage_mapping(struct hid_device *hdev, } } -static void wacom_wac_pad_event(struct hid_device *hdev, struct hid_field *field, +static void wacom_wac_pad_battery_event(struct hid_device *hdev, struct hid_field *field, struct hid_usage *usage, __s32 value) { struct wacom *wacom = hid_get_drvdata(hdev); struct wacom_wac *wacom_wac = &wacom->wacom_wac; - struct input_dev *input = wacom_wac->pad_input; unsigned equivalent_usage = wacom_equivalent_usage(usage->hid); - if (wacom_equivalent_usage(field->physical) == HID_DG_TABLETFUNCTIONKEY) { - wacom_wac->hid_data.inrange_state |= value; - } - switch (equivalent_usage) { case WACOM_HID_WD_BATTERY_LEVEL: wacom_wac->hid_data.battery_capacity = value; @@ -1614,11 +1609,29 @@ static void wacom_wac_pad_event(struct hid_device *hdev, struct hid_field *field wacom_wac->hid_data.ps_connected = value; wacom_wac->hid_data.bat_connected = 1; break; + } +} + +static void wacom_wac_pad_event(struct hid_device *hdev, struct hid_field *field, + struct hid_usage *usage, __s32 value) +{ + struct wacom *wacom = hid_get_drvdata(hdev); + struct wacom_wac *wacom_wac = &wacom->wacom_wac; + struct input_dev *input = wacom_wac->pad_input; + struct wacom_features *features = &wacom_wac->features; + unsigned equivalent_usage = wacom_equivalent_usage(usage->hid); + + wacom_wac_pad_battery_event(hdev, field, usage, value); + if (wacom_equivalent_usage(field->physical) == HID_DG_TABLETFUNCTIONKEY) { + wacom_wac->hid_data.inrange_state |= value; + } + switch (equivalent_usage) { case WACOM_HID_WD_TOUCHRINGSTATUS: break; default: + features->input_event_flag = true; input_event(input, usage->type, usage->code, value); break; } @@ -1633,6 +1646,25 @@ static void wacom_wac_pad_pre_report(struct hid_device *hdev, wacom_wac->hid_data.inrange_state = 0; } +static void wacom_wac_pad_battery_report(struct hid_device *hdev, + struct hid_report *report) + { + struct wacom *wacom = hid_get_drvdata(hdev); + struct wacom_wac *wacom_wac = &wacom->wacom_wac; + struct wacom_features *features = &wacom_wac->features; + + if (features->quirks & WACOM_QUIRK_BATTERY) { + int capacity = wacom_wac->hid_data.battery_capacity; + bool charging = wacom_wac->hid_data.bat_charging; + bool connected = wacom_wac->hid_data.bat_connected; + bool powered = wacom_wac->hid_data.ps_connected; + + wacom_notify_battery(wacom_wac, capacity, charging, + connected, powered); + } + +} + static void wacom_wac_pad_report(struct hid_device *hdev, struct hid_report *report) { @@ -1642,24 +1674,18 @@ static void wacom_wac_pad_report(struct hid_device *hdev, struct input_dev *input = wacom_wac->pad_input; bool active = wacom_wac->hid_data.inrange_state != 0; - /* - * don't report prox for events like accelerometer - * or battery status - */ - if (wacom_equivalent_usage(report->field[0]->physical) == HID_DG_TABLETFUNCTIONKEY) - input_event(input, EV_ABS, ABS_MISC, active ? PAD_DEVICE_ID : 0); - - if (features->quirks & WACOM_QUIRK_BATTERY) { - int capacity = wacom_wac->hid_data.battery_capacity; - bool charging = wacom_wac->hid_data.bat_charging; - bool connected = wacom_wac->hid_data.bat_connected; - bool powered = wacom_wac->hid_data.ps_connected; + wacom_wac_pad_battery_report(hdev, report); - wacom_notify_battery(wacom_wac, capacity, charging, - connected, powered); + /* report prox for expresskey events */ + if (wacom_equivalent_usage(report->field[0]->physical) == HID_DG_TABLETFUNCTIONKEY) { + features->input_event_flag = true; + input_event(input, EV_ABS, ABS_MISC, active ? PAD_DEVICE_ID : 0); } - input_sync(input); + if (features->input_event_flag) { + features->input_event_flag = false; + input_sync(input); + } } static void wacom_wac_pen_usage_mapping(struct hid_device *hdev, @@ -2118,9 +2144,12 @@ void wacom_wac_event(struct hid_device *hdev, struct hid_field *field, if (wacom->wacom_wac.features.type != HID_GENERIC) return; - if (WACOM_PAD_FIELD(field) && wacom->wacom_wac.pad_input) - wacom_wac_pad_event(hdev, field, usage, value); - else if (WACOM_PEN_FIELD(field) && wacom->wacom_wac.pen_input) + if (WACOM_PAD_FIELD(field)) { + if (wacom->wacom_wac.pad_input) + wacom_wac_pad_event(hdev, field, usage, value); + else + wacom_wac_pad_battery_event(hdev, field, usage, value); + } else if (WACOM_PEN_FIELD(field) && wacom->wacom_wac.pen_input) wacom_wac_pen_event(hdev, field, usage, value); else if (WACOM_FINGER_FIELD(field) && wacom->wacom_wac.touch_input) wacom_wac_finger_event(hdev, field, usage, value); @@ -2163,9 +2192,12 @@ void wacom_wac_report(struct hid_device *hdev, struct hid_report *report) wacom_report_events(hdev, report); - if (WACOM_PAD_FIELD(field) && wacom->wacom_wac.pad_input) - return wacom_wac_pad_report(hdev, report); - else if (WACOM_PEN_FIELD(field) && wacom->wacom_wac.pen_input) + if (WACOM_PAD_FIELD(field)) { + if (wacom->wacom_wac.pad_input) + return wacom_wac_pad_report(hdev, report); + else + return wacom_wac_pad_battery_report(hdev, report); + } else if (WACOM_PEN_FIELD(field) && wacom->wacom_wac.pen_input) return wacom_wac_pen_report(hdev, report); else if (WACOM_FINGER_FIELD(field) && wacom->wacom_wac.touch_input) return wacom_wac_finger_report(hdev, report); diff --git a/drivers/hid/wacom_wac.h b/drivers/hid/wacom_wac.h index a54a301..fb0e50a 100644 --- a/drivers/hid/wacom_wac.h +++ b/drivers/hid/wacom_wac.h @@ -232,6 +232,7 @@ struct wacom_features { int pktlen; bool check_for_hid_type; int hid_type; + bool input_event_flag; }; struct wacom_shared {