All of lore.kernel.org
 help / color / mirror / Atom feed
From: Angela Czubak <acz@semihalf.com>
To: linux-input@vger.kernel.org
Cc: upstream@semihalf.com, dmitry.torokhov@gmail.com,
	Angela Czubak <acz@semihalf.com>
Subject: [PATCH 13/18] Input: MT - toggle ABS_PRESSURE pointer emulation
Date: Tue, 21 Dec 2021 19:17:38 +0000	[thread overview]
Message-ID: <20211221191743.1893185-14-acz@semihalf.com> (raw)
In-Reply-To: <20211221191743.1893185-1-acz@semihalf.com>

Add a function to switch off ABS_PRESSURE generation if necessary.
This may be helpful in case drivers want to generate ABS_PRESSURE events
themselves from ABS_MT_PRESSURE.

Signed-off-by: Angela Czubak <acz@semihalf.com>
---
 drivers/input/input-mt.c | 18 ++++++++++++++++--
 include/linux/input/mt.h |  4 ++++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/drivers/input/input-mt.c b/drivers/input/input-mt.c
index 44fe6f2f063c..e0bf5917a8b5 100644
--- a/drivers/input/input-mt.c
+++ b/drivers/input/input-mt.c
@@ -52,6 +52,7 @@ int input_mt_init_slots(struct input_dev *dev, unsigned int num_slots,
 
 	mt->num_slots = num_slots;
 	mt->flags = flags;
+	mt->abs_pressure_gen = true;
 	input_set_abs_params(dev, ABS_MT_SLOT, 0, num_slots - 1, 0, 0);
 	input_set_abs_params(dev, ABS_MT_TRACKING_ID, 0, TRKID_MAX, 0, 0);
 
@@ -244,12 +245,14 @@ void input_mt_report_pointer_emulation(struct input_dev *dev, bool use_count)
 		input_event(dev, EV_ABS, ABS_X, x);
 		input_event(dev, EV_ABS, ABS_Y, y);
 
-		if (test_bit(ABS_MT_PRESSURE, dev->absbit)) {
+		if (test_bit(ABS_MT_PRESSURE, dev->absbit) &&
+		    mt->abs_pressure_gen) {
 			int p = input_mt_get_value(oldest, ABS_MT_PRESSURE);
 			input_event(dev, EV_ABS, ABS_PRESSURE, p);
 		}
 	} else {
-		if (test_bit(ABS_MT_PRESSURE, dev->absbit))
+		if (test_bit(ABS_MT_PRESSURE, dev->absbit) &&
+		    mt->abs_pressure_gen)
 			input_event(dev, EV_ABS, ABS_PRESSURE, 0);
 	}
 }
@@ -312,6 +315,17 @@ void input_mt_sync_frame(struct input_dev *dev)
 }
 EXPORT_SYMBOL(input_mt_sync_frame);
 
+void input_mt_pressure_toggle(struct input_dev *dev, bool toggle)
+{
+	struct input_mt *mt = dev->mt;
+
+	if (!mt)
+		return;
+
+	mt->abs_pressure_gen = toggle;
+}
+EXPORT_SYMBOL(input_mt_pressure_toggle);
+
 static int adjust_dual(int *begin, int step, int *end, int eq, int mu)
 {
 	int f, *p, s, c;
diff --git a/include/linux/input/mt.h b/include/linux/input/mt.h
index 3b8580bd33c1..c870a513bde1 100644
--- a/include/linux/input/mt.h
+++ b/include/linux/input/mt.h
@@ -38,6 +38,7 @@ struct input_mt_slot {
  * @flags: input_mt operation flags
  * @frame: increases every time input_mt_sync_frame() is called
  * @red: reduced cost matrix for in-kernel tracking
+ * @abs_pressure_gen: emulate pointer pressure
  * @slots: array of slots holding current values of tracked contacts
  */
 struct input_mt {
@@ -47,6 +48,7 @@ struct input_mt {
 	unsigned int flags;
 	unsigned int frame;
 	int *red;
+	bool abs_pressure_gen;
 	struct input_mt_slot slots[];
 };
 
@@ -111,6 +113,8 @@ void input_mt_drop_unused(struct input_dev *dev);
 
 void input_mt_sync_frame(struct input_dev *dev);
 
+void input_mt_pressure_toggle(struct input_dev *dev, bool toggle);
+
 /**
  * struct input_mt_pos - contact position
  * @x: horizontal coordinate
-- 
2.34.1.307.g9b7440fafd-goog


  parent reply	other threads:[~2021-12-21 19:17 UTC|newest]

Thread overview: 48+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-12-21 19:17 [PATCH 00/18] *** Implement simple haptic HID support *** Angela Czubak
2021-12-21 19:17 ` [PATCH 01/18] HID: add haptics page defines Angela Czubak
2022-01-07 21:40   ` Dmitry Torokhov
2021-12-21 19:17 ` [PATCH 02/18] Input: add FF_HID effect type Angela Czubak
2021-12-30 16:41   ` Harry Cutts
2021-12-21 19:17 ` [PATCH 03/18] Input: add INPUT_PROP_HAPTIC_TOUCHPAD Angela Czubak
2022-01-07 21:43   ` Dmitry Torokhov
2021-12-21 19:17 ` [PATCH 04/18] HID: haptic: introduce hid_haptic_device Angela Czubak
2022-01-07 22:18   ` Dmitry Torokhov
2022-01-10 19:42     ` Angela Czubak
2021-12-21 19:17 ` [PATCH 05/18] HID: introduce hid_get_feature Angela Czubak
2022-01-07 22:01   ` Dmitry Torokhov
2022-01-10 19:43     ` Angela Czubak
2022-01-12  9:43       ` Benjamin Tissoires
2022-01-12 11:26         ` Angela Czubak
2022-01-13  9:54           ` Benjamin Tissoires
2022-01-14 18:24             ` Angela Czubak
2022-01-17 10:08               ` Benjamin Tissoires
2021-12-21 19:17 ` [PATCH 06/18] HID: haptic: add functions for mapping and configuration Angela Czubak
2021-12-21 19:17 ` [PATCH 07/18] HID: input: allow mapping of haptic output Angela Czubak
2022-01-07 21:58   ` Dmitry Torokhov
2021-12-21 19:17 ` [PATCH 08/18] HID: haptic: initialize haptic device Angela Czubak
2021-12-21 19:17 ` [PATCH 09/18] Input: add shared effects Angela Czubak
2021-12-21 19:17 ` [PATCH 10/18] HID: haptic: implement release and press effects Angela Czubak
2021-12-21 19:17 ` [PATCH 11/18] HID: input: calculate resolution for pressure Angela Czubak
2022-01-07 22:23   ` Dmitry Torokhov
2021-12-21 19:17 ` [PATCH 12/18] HID: haptic: add functions handling events Angela Czubak
2021-12-21 19:17 ` Angela Czubak [this message]
2022-01-07 22:07   ` [PATCH 13/18] Input: MT - toggle ABS_PRESSURE pointer emulation Dmitry Torokhov
2022-01-10 19:43     ` Angela Czubak
2022-01-10 21:02       ` Dmitry Torokhov
2022-01-11 17:06         ` Angela Czubak
2022-01-12  2:19           ` Sean O'Brien
2022-01-12  2:52             ` Dmitry Torokhov
2022-01-12  9:02               ` Angela Czubak
2022-01-12  9:17               ` Benjamin Tissoires
2022-01-14 18:26                 ` Angela Czubak
2022-01-21  6:10               ` Peter Hutterer
2022-01-25 16:56                 ` Angela Czubak
2022-01-28  5:25                   ` Peter Hutterer
2021-12-21 19:17 ` [PATCH 14/18] HID: haptic: add hid_haptic_switch_mode Angela Czubak
2021-12-21 19:17 ` [PATCH 15/18] HID: multitouch: add haptic multitouch support Angela Czubak
2021-12-21 19:17 ` [PATCH 16/18] Input: introduce EVIOCFF(TAKE|RELEASE)CONTROL Angela Czubak
2021-12-21 19:17 ` [PATCH 17/18] HID: haptic: add hid_haptic_change_control Angela Czubak
2021-12-21 19:17 ` [PATCH 18/18] HID: i2c-hid: fix i2c_hid_set_or_send_report Angela Czubak
2022-01-08  6:46   ` Dmitry Torokhov
2022-01-10 19:43     ` Angela Czubak
2021-12-22 16:17 ` [PATCH 00/18] *** Implement simple haptic HID support *** Roderick Colenbrander

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211221191743.1893185-14-acz@semihalf.com \
    --to=acz@semihalf.com \
    --cc=dmitry.torokhov@gmail.com \
    --cc=linux-input@vger.kernel.org \
    --cc=upstream@semihalf.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.