Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 8 Sep 2021 00:02:21 GMT
From:      Vladimir Kondratyev <wulf@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: a437dfa5ca96 - stable/13 - evdev: Multitouch code style changes.
Message-ID:  <202109080002.18802Lct050207@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by wulf:

URL: https://cgit.FreeBSD.org/src/commit/?id=a437dfa5ca9698d8226f71f4d6f50fa49ea9ee3e

commit a437dfa5ca9698d8226f71f4d6f50fa49ea9ee3e
Author:     Vladimir Kondratyev <wulf@FreeBSD.org>
AuthorDate: 2021-08-24 22:43:41 +0000
Commit:     Vladimir Kondratyev <wulf@FreeBSD.org>
CommitDate: 2021-09-07 23:55:12 +0000

    evdev: Multitouch code style changes.
    
    1. Move touch count reporting helpers to utils. They are not multitouch.
    2. Use evdev_mt prefix for private multitouch support routines.
    3. Use int instead of int32_t where fixed size is not required.
    4. Export some internal functions.
    
    This change should be no-op.
    
    (cherry picked from commit 98a7606b85e05132f328a2498dccab78df31cb7e)
---
 sys/dev/evdev/cdev.c          |   2 +-
 sys/dev/evdev/evdev.c         |  19 +++---
 sys/dev/evdev/evdev.h         |  12 +++-
 sys/dev/evdev/evdev_mt.c      | 152 +++++++++++++++++++-----------------------
 sys/dev/evdev/evdev_private.h |  12 ++--
 sys/dev/evdev/evdev_utils.c   |  41 ++++++++++++
 6 files changed, 134 insertions(+), 104 deletions(-)

diff --git a/sys/dev/evdev/cdev.c b/sys/dev/evdev/cdev.c
index 66d00ad16aee..d124e691a7c3 100644
--- a/sys/dev/evdev/cdev.c
+++ b/sys/dev/evdev/cdev.c
@@ -621,7 +621,7 @@ evdev_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int fflag,
 		    MIN(len / sizeof(int32_t) - 1, MAXIMAL_MT_SLOT(evdev) + 1);
 		for (int i = 0; i < nvalues; i++)
 			((int32_t *)data)[i + 1] =
-			    evdev_get_mt_value(evdev, i, code);
+			    evdev_mt_get_value(evdev, i, code);
 		return (0);
 
 	case EVIOCGKEY(0):
diff --git a/sys/dev/evdev/evdev.c b/sys/dev/evdev/evdev.c
index 597342a364af..8483faee8d6b 100644
--- a/sys/dev/evdev/evdev.c
+++ b/sys/dev/evdev/evdev.c
@@ -707,8 +707,8 @@ evdev_modify_event(struct evdev_dev *evdev, uint16_t type, uint16_t code,
 		else if (!ABS_IS_MT(code))
 			old_value = evdev->ev_absinfo[code].value;
 		else if (bit_test(evdev->ev_abs_flags, ABS_MT_SLOT))
-			old_value = evdev_get_mt_value(evdev,
-			    evdev_get_last_mt_slot(evdev), code);
+			old_value = evdev_mt_get_value(evdev,
+			    evdev_mt_get_last_slot(evdev), code);
 		else	/* Pass MT protocol type A events as is */
 			break;
 
@@ -788,7 +788,7 @@ evdev_sparse_event(struct evdev_dev *evdev, uint16_t type, uint16_t code,
 		switch (code) {
 		case ABS_MT_SLOT:
 			/* Postpone ABS_MT_SLOT till next event */
-			evdev_set_last_mt_slot(evdev, value);
+			evdev_mt_set_last_slot(evdev, value);
 			return (EV_SKIP_EVENT);
 
 		case ABS_MT_FIRST ... ABS_MT_LAST:
@@ -796,11 +796,11 @@ evdev_sparse_event(struct evdev_dev *evdev, uint16_t type, uint16_t code,
 			if (!bit_test(evdev->ev_abs_flags, ABS_MT_SLOT))
 				break;
 			/* Don`t repeat MT protocol type B events */
-			last_mt_slot = evdev_get_last_mt_slot(evdev);
-			if (evdev_get_mt_value(evdev, last_mt_slot, code)
+			last_mt_slot = evdev_mt_get_last_slot(evdev);
+			if (evdev_mt_get_value(evdev, last_mt_slot, code)
 			     == value)
 				return (EV_SKIP_EVENT);
-			evdev_set_mt_value(evdev, last_mt_slot, code, value);
+			evdev_mt_set_value(evdev, last_mt_slot, code, value);
 			if (last_mt_slot != CURRENT_MT_SLOT(evdev)) {
 				CURRENT_MT_SLOT(evdev) = last_mt_slot;
 				evdev->ev_report_opened = true;
@@ -941,11 +941,8 @@ evdev_push_event(struct evdev_dev *evdev, uint16_t type, uint16_t code,
 
 	evdev_modify_event(evdev, type, code, &value);
 	if (type == EV_SYN && code == SYN_REPORT &&
-	     bit_test(evdev->ev_flags, EVDEV_FLAG_MT_AUTOREL))
-		evdev_send_mt_autorel(evdev);
-	if (type == EV_SYN && code == SYN_REPORT && evdev->ev_report_opened &&
-	    bit_test(evdev->ev_flags, EVDEV_FLAG_MT_STCOMPAT))
-		evdev_send_mt_compat(evdev);
+	    bit_test(evdev->ev_abs_flags, ABS_MT_SLOT))
+		evdev_mt_sync_frame(evdev);
 	evdev_send_event(evdev, type, code, value);
 
 	EVDEV_EXIT(evdev);
diff --git a/sys/dev/evdev/evdev.h b/sys/dev/evdev/evdev.h
index 30d6a106d8b3..fe21f8cea4c2 100644
--- a/sys/dev/evdev/evdev.h
+++ b/sys/dev/evdev/evdev.h
@@ -131,11 +131,15 @@ void evdev_set_flag(struct evdev_dev *, uint16_t);
 void *evdev_get_softc(struct evdev_dev *);
 
 /* Multitouch related functions: */
-int32_t evdev_get_mt_slot_by_tracking_id(struct evdev_dev *, int32_t);
-void evdev_support_nfingers(struct evdev_dev *, int32_t);
+int evdev_get_mt_slot_by_tracking_id(struct evdev_dev *, int32_t);
 void evdev_support_mt_compat(struct evdev_dev *);
-void evdev_push_nfingers(struct evdev_dev *, int32_t);
 void evdev_push_mt_compat(struct evdev_dev *);
+void evdev_mt_push_autorel(struct evdev_dev *);
+static inline int
+evdev_mt_id_to_slot(struct evdev_dev *evdev, int32_t id)
+{
+	return (evdev_get_mt_slot_by_tracking_id(evdev, id));
+}
 
 /* Utility functions: */
 uint16_t evdev_hid2key(int);
@@ -144,6 +148,8 @@ uint16_t evdev_scancode2key(int *, int);
 void evdev_push_mouse_btn(struct evdev_dev *, int);
 void evdev_push_leds(struct evdev_dev *, int);
 void evdev_push_repeats(struct evdev_dev *, keyboard_t *);
+void evdev_support_nfingers(struct evdev_dev *, int);
+void evdev_push_nfingers(struct evdev_dev *, int);
 
 /* Event reporting shortcuts: */
 static __inline int
diff --git a/sys/dev/evdev/evdev_mt.c b/sys/dev/evdev/evdev_mt.c
index 1f9c9756db02..e8f892e235c0 100644
--- a/sys/dev/evdev/evdev_mt.c
+++ b/sys/dev/evdev/evdev_mt.c
@@ -42,14 +42,6 @@
 #define	debugf(fmt, args...)
 #endif
 
-static uint16_t evdev_fngmap[] = {
-	BTN_TOOL_FINGER,
-	BTN_TOOL_DOUBLETAP,
-	BTN_TOOL_TRIPLETAP,
-	BTN_TOOL_QUADTAP,
-	BTN_TOOL_QUINTTAP,
-};
-
 static uint16_t evdev_mtstmap[][2] = {
 	{ ABS_MT_POSITION_X, ABS_X },
 	{ ABS_MT_POSITION_Y, ABS_Y },
@@ -58,23 +50,26 @@ static uint16_t evdev_mtstmap[][2] = {
 };
 
 struct evdev_mt_slot {
-	uint64_t ev_report;
-	int32_t ev_mt_states[MT_CNT];
+	uint64_t	ev_report;
+	int32_t		val[MT_CNT];
 };
 
 struct evdev_mt {
-	int32_t	ev_mt_last_reported_slot;
-	struct evdev_mt_slot ev_mt_slots[];
+	int			last_reported_slot;
+	struct evdev_mt_slot	slots[];
 };
 
+static void	evdev_mt_send_st_compat(struct evdev_dev *);
+static void	evdev_mt_send_autorel(struct evdev_dev *);
+
 void
 evdev_mt_init(struct evdev_dev *evdev)
 {
-	int32_t slot, slots;
+	int slot, slots;
 
 	slots = MAXIMAL_MT_SLOT(evdev) + 1;
 
-	evdev->ev_mt = malloc(offsetof(struct evdev_mt, ev_mt_slots) +
+	evdev->ev_mt = malloc(offsetof(struct evdev_mt, slots) +
 	     sizeof(struct evdev_mt_slot) * slots, M_EVDEV, M_WAITOK | M_ZERO);
 
 	/* Initialize multitouch protocol type B states */
@@ -84,9 +79,9 @@ evdev_mt_init(struct evdev_dev *evdev)
 		 * report counter (0) as it brokes free slot detection in
 		 * evdev_get_mt_slot_by_tracking_id. So initialize it to -1
 		 */
-		evdev->ev_mt->ev_mt_slots[slot] = (struct evdev_mt_slot) {
+		evdev->ev_mt->slots[slot] = (struct evdev_mt_slot) {
 			.ev_report = 0xFFFFFFFFFFFFFFFFULL,
-			.ev_mt_states[ABS_MT_INDEX(ABS_MT_TRACKING_ID)] = -1,
+			.val[ABS_MT_INDEX(ABS_MT_TRACKING_ID)] = -1,
 		};
 	}
 
@@ -97,49 +92,66 @@ evdev_mt_init(struct evdev_dev *evdev)
 void
 evdev_mt_free(struct evdev_dev *evdev)
 {
-
 	free(evdev->ev_mt, M_EVDEV);
 }
 
-int32_t
-evdev_get_last_mt_slot(struct evdev_dev *evdev)
+void
+evdev_mt_sync_frame(struct evdev_dev *evdev)
 {
+	if (bit_test(evdev->ev_flags, EVDEV_FLAG_MT_AUTOREL))
+		evdev_mt_send_autorel(evdev);
+	if (evdev->ev_report_opened &&
+	    bit_test(evdev->ev_flags, EVDEV_FLAG_MT_STCOMPAT))
+		evdev_mt_send_st_compat(evdev);
+}
 
-	return (evdev->ev_mt->ev_mt_last_reported_slot);
+int
+evdev_mt_get_last_slot(struct evdev_dev *evdev)
+{
+	return (evdev->ev_mt->last_reported_slot);
 }
 
 void
-evdev_set_last_mt_slot(struct evdev_dev *evdev, int32_t slot)
+evdev_mt_set_last_slot(struct evdev_dev *evdev, int slot)
 {
+	struct evdev_mt *mt = evdev->ev_mt;
+
+	MPASS(slot >= 0 && slot <= MAXIMAL_MT_SLOT(evdev));
 
-	evdev->ev_mt->ev_mt_slots[slot].ev_report = evdev->ev_report_count;
-	evdev->ev_mt->ev_mt_last_reported_slot = slot;
+	mt->slots[slot].ev_report = evdev->ev_report_count;
+	mt->last_reported_slot = slot;
 }
 
-inline int32_t
-evdev_get_mt_value(struct evdev_dev *evdev, int32_t slot, int16_t code)
+int32_t
+evdev_mt_get_value(struct evdev_dev *evdev, int slot, int16_t code)
 {
+	struct evdev_mt *mt = evdev->ev_mt;
+
+	MPASS(slot >= 0 && slot <= MAXIMAL_MT_SLOT(evdev));
 
-	return (evdev->ev_mt->
-	    ev_mt_slots[slot].ev_mt_states[ABS_MT_INDEX(code)]);
+	return (mt->slots[slot].val[ABS_MT_INDEX(code)]);
 }
 
-inline void
-evdev_set_mt_value(struct evdev_dev *evdev, int32_t slot, int16_t code,
+void
+evdev_mt_set_value(struct evdev_dev *evdev, int slot, int16_t code,
     int32_t value)
 {
+	struct evdev_mt *mt = evdev->ev_mt;
+
+	MPASS(slot >= 0 && slot <= MAXIMAL_MT_SLOT(evdev));
 
-	evdev->ev_mt->ev_mt_slots[slot].ev_mt_states[ABS_MT_INDEX(code)] =
-	    value;
+	mt->slots[slot].val[ABS_MT_INDEX(code)] = value;
 }
 
-int32_t
+int
 evdev_get_mt_slot_by_tracking_id(struct evdev_dev *evdev, int32_t tracking_id)
 {
-	int32_t tr_id, slot, free_slot = -1;
+	struct evdev_mt *mt = evdev->ev_mt;
+	int32_t tr_id;
+	int slot, free_slot = -1;
 
 	for (slot = 0; slot <= MAXIMAL_MT_SLOT(evdev); slot++) {
-		tr_id = evdev_get_mt_value(evdev, slot, ABS_MT_TRACKING_ID);
+		tr_id = evdev_mt_get_value(evdev, slot, ABS_MT_TRACKING_ID);
 		if (tr_id == tracking_id)
 			return (slot);
 		/*
@@ -149,27 +161,17 @@ evdev_get_mt_slot_by_tracking_id(struct evdev_dev *evdev, int32_t tracking_id)
 		 * ABS_MT_TRACKING_ID change.
 		 */
 		if (free_slot == -1 && tr_id == -1 &&
-		    evdev->ev_mt->ev_mt_slots[slot].ev_report !=
-		    evdev->ev_report_count)
+		    mt->slots[slot].ev_report != evdev->ev_report_count)
 			free_slot = slot;
 	}
 
 	return (free_slot);
 }
 
-void
-evdev_support_nfingers(struct evdev_dev *evdev, int32_t nfingers)
-{
-	int32_t i;
-
-	for (i = 0; i < MIN(nitems(evdev_fngmap), nfingers); i++)
-		evdev_support_key(evdev, evdev_fngmap[i]);
-}
-
 void
 evdev_support_mt_compat(struct evdev_dev *evdev)
 {
-	int32_t i;
+	int i;
 
 	if (evdev->ev_absinfo == NULL)
 		return;
@@ -195,56 +197,32 @@ evdev_support_mt_compat(struct evdev_dev *evdev)
 static int32_t
 evdev_count_fingers(struct evdev_dev *evdev)
 {
-	int32_t nfingers = 0, i;
+	int nfingers = 0, i;
 
 	for (i = 0; i <= MAXIMAL_MT_SLOT(evdev); i++)
-		if (evdev_get_mt_value(evdev, i, ABS_MT_TRACKING_ID) != -1)
+		if (evdev_mt_get_value(evdev, i, ABS_MT_TRACKING_ID) != -1)
 			nfingers++;
 
 	return (nfingers);
 }
 
 static void
-evdev_send_nfingers(struct evdev_dev *evdev, int32_t nfingers)
-{
-	int32_t i;
-
-	EVDEV_LOCK_ASSERT(evdev);
-
-	if (nfingers > nitems(evdev_fngmap))
-		nfingers = nitems(evdev_fngmap);
-
-	for (i = 0; i < nitems(evdev_fngmap); i++)
-		evdev_send_event(evdev, EV_KEY, evdev_fngmap[i],
-		    nfingers == i + 1);
-}
-
-void
-evdev_push_nfingers(struct evdev_dev *evdev, int32_t nfingers)
+evdev_mt_send_st_compat(struct evdev_dev *evdev)
 {
-
-	EVDEV_ENTER(evdev);
-	evdev_send_nfingers(evdev, nfingers);
-	EVDEV_EXIT(evdev);
-}
-
-void
-evdev_send_mt_compat(struct evdev_dev *evdev)
-{
-	int32_t nfingers, i;
+	int nfingers, i;
 
 	EVDEV_LOCK_ASSERT(evdev);
 
 	nfingers = evdev_count_fingers(evdev);
 	evdev_send_event(evdev, EV_KEY, BTN_TOUCH, nfingers > 0);
 
-	if (evdev_get_mt_value(evdev, 0, ABS_MT_TRACKING_ID) != -1)
+	if (evdev_mt_get_value(evdev, 0, ABS_MT_TRACKING_ID) != -1)
 		/* Echo 0-th MT-slot as ST-slot */
 		for (i = 0; i < nitems(evdev_mtstmap); i++)
 			if (bit_test(evdev->ev_abs_flags, evdev_mtstmap[i][1]))
 				evdev_send_event(evdev, EV_ABS,
 				    evdev_mtstmap[i][1],
-				    evdev_get_mt_value(evdev, 0,
+				    evdev_mt_get_value(evdev, 0,
 				    evdev_mtstmap[i][0]));
 
 	/* Touchscreens should not report tool taps */
@@ -260,24 +238,32 @@ evdev_push_mt_compat(struct evdev_dev *evdev)
 {
 
 	EVDEV_ENTER(evdev);
-	evdev_send_mt_compat(evdev);
+	evdev_mt_send_st_compat(evdev);
 	EVDEV_EXIT(evdev);
 }
 
-void
-evdev_send_mt_autorel(struct evdev_dev *evdev)
+static void
+evdev_mt_send_autorel(struct evdev_dev *evdev)
 {
-	int32_t slot;
+	struct evdev_mt *mt = evdev->ev_mt;
+	int slot;
 
 	EVDEV_LOCK_ASSERT(evdev);
 
 	for (slot = 0; slot <= MAXIMAL_MT_SLOT(evdev); slot++) {
-		if (evdev->ev_mt->ev_mt_slots[slot].ev_report !=
-		    evdev->ev_report_count &&
-		    evdev_get_mt_value(evdev, slot, ABS_MT_TRACKING_ID) != -1){
+		if (mt->slots[slot].ev_report != evdev->ev_report_count &&
+		    evdev_mt_get_value(evdev, slot, ABS_MT_TRACKING_ID) != -1){
 			evdev_send_event(evdev, EV_ABS, ABS_MT_SLOT, slot);
 			evdev_send_event(evdev, EV_ABS, ABS_MT_TRACKING_ID,
 			    -1);
 		}
 	}
 }
+
+void
+evdev_mt_push_autorel(struct evdev_dev *evdev)
+{
+	EVDEV_ENTER(evdev);
+	evdev_mt_send_autorel(evdev);
+	EVDEV_EXIT(evdev);
+}
diff --git a/sys/dev/evdev/evdev_private.h b/sys/dev/evdev/evdev_private.h
index 463f93847295..fc079a324ba4 100644
--- a/sys/dev/evdev/evdev_private.h
+++ b/sys/dev/evdev/evdev_private.h
@@ -279,14 +279,14 @@ void evdev_revoke_client(struct evdev_client *);
 /* Multitouch related functions: */
 void evdev_mt_init(struct evdev_dev *);
 void evdev_mt_free(struct evdev_dev *);
-int32_t evdev_get_last_mt_slot(struct evdev_dev *);
-void evdev_set_last_mt_slot(struct evdev_dev *, int32_t);
-int32_t evdev_get_mt_value(struct evdev_dev *, int32_t, int16_t);
-void evdev_set_mt_value(struct evdev_dev *, int32_t, int16_t, int32_t);
-void evdev_send_mt_compat(struct evdev_dev *);
-void evdev_send_mt_autorel(struct evdev_dev *);
+void evdev_mt_sync_frame(struct evdev_dev *);
+int evdev_mt_get_last_slot(struct evdev_dev *);
+void evdev_mt_set_last_slot(struct evdev_dev *, int);
+int32_t evdev_mt_get_value(struct evdev_dev *, int, int16_t);
+void evdev_mt_set_value(struct evdev_dev *, int, int16_t, int32_t);
 
 /* Utility functions: */
 void evdev_client_dumpqueue(struct evdev_client *);
+void evdev_send_nfingers(struct evdev_dev *, int);
 
 #endif	/* _DEV_EVDEV_EVDEV_PRIVATE_H */
diff --git a/sys/dev/evdev/evdev_utils.c b/sys/dev/evdev/evdev_utils.c
index dcdd3a6d5126..9bb58d9b7ba1 100644
--- a/sys/dev/evdev/evdev_utils.c
+++ b/sys/dev/evdev/evdev_utils.c
@@ -38,6 +38,7 @@
 #include <sys/systm.h>
 
 #include <dev/evdev/evdev.h>
+#include <dev/evdev/evdev_private.h>
 #include <dev/evdev/input.h>
 
 #define	NONE	KEY_RESERVED
@@ -205,6 +206,14 @@ static uint16_t evdev_led_codes[] = {
 	LED_SCROLLL,	/* SLKED */
 };
 
+static uint16_t evdev_nfinger_codes[] = {
+	BTN_TOOL_FINGER,
+	BTN_TOOL_DOUBLETAP,
+	BTN_TOOL_TRIPLETAP,
+	BTN_TOOL_QUADTAP,
+	BTN_TOOL_QUINTTAP,
+};
+
 uint16_t
 evdev_hid2key(int scancode)
 {
@@ -300,3 +309,35 @@ evdev_push_repeats(struct evdev_dev *evdev, keyboard_t *kbd)
 	evdev_push_event(evdev, EV_REP, REP_DELAY, kbd->kb_delay1);
 	evdev_push_event(evdev, EV_REP, REP_PERIOD, kbd->kb_delay2);
 }
+
+void
+evdev_support_nfingers(struct evdev_dev *evdev, int nfingers)
+{
+	int i;
+
+	for (i = 0; i < MIN(nitems(evdev_nfinger_codes), nfingers); i++)
+		evdev_support_key(evdev, evdev_nfinger_codes[i]);
+}
+
+void
+evdev_send_nfingers(struct evdev_dev *evdev, int nfingers)
+{
+	int i;
+
+	EVDEV_LOCK_ASSERT(evdev);
+
+	if (nfingers > nitems(evdev_nfinger_codes))
+		nfingers = nitems(evdev_nfinger_codes);
+
+	for (i = 0; i < nitems(evdev_nfinger_codes); i++)
+		evdev_send_event(evdev, EV_KEY, evdev_nfinger_codes[i],
+			nfingers == i + 1);
+}
+
+void
+evdev_push_nfingers(struct evdev_dev *evdev, int nfingers)
+{
+	EVDEV_ENTER(evdev);
+	evdev_send_nfingers(evdev, nfingers);
+	EVDEV_EXIT(evdev);
+}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202109080002.18802Lct050207>