linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Henrik Rydberg" <rydberg@euromail.se>
To: Dmitry Torokhov <dmitry.torokhov@gmail.com>,
	Jiri Kosina <jkosina@suse.cz>
Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org,
	Henrik Rydberg <rydberg@euromail.se>
Subject: [PATCH 13/20] Input: bcm5974 - Preparatory renames
Date: Sun, 26 Aug 2012 14:57:31 +0200	[thread overview]
Message-ID: <1345985858-445-14-git-send-email-rydberg@euromail.se> (raw)
In-Reply-To: <1345985858-445-1-git-send-email-rydberg@euromail.se>

Rename touch properties to match established nomenclature, and define
the maximum number of fingers.

Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
---
 drivers/input/mouse/bcm5974.c | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/drivers/input/mouse/bcm5974.c b/drivers/input/mouse/bcm5974.c
index 8965824..cb9383e 100644
--- a/drivers/input/mouse/bcm5974.c
+++ b/drivers/input/mouse/bcm5974.c
@@ -183,18 +183,19 @@ struct tp_finger {
 	__le16 abs_y;		/* absolute y coodinate */
 	__le16 rel_x;		/* relative x coodinate */
 	__le16 rel_y;		/* relative y coodinate */
-	__le16 size_major;	/* finger size, major axis? */
-	__le16 size_minor;	/* finger size, minor axis? */
+	__le16 tool_major;	/* tool area, major axis */
+	__le16 tool_minor;	/* tool area, minor axis */
 	__le16 orientation;	/* 16384 when point, else 15 bit angle */
-	__le16 force_major;	/* trackpad force, major axis? */
-	__le16 force_minor;	/* trackpad force, minor axis? */
+	__le16 touch_major;	/* touch area, major axis */
+	__le16 touch_minor;	/* touch area, minor axis */
 	__le16 unused[3];	/* zeros */
 	__le16 multi;		/* one finger: varies, more fingers: constant */
 } __attribute__((packed,aligned(2)));
 
 /* trackpad finger data size, empirically at least ten fingers */
+#define MAX_FINGERS		16
 #define SIZEOF_FINGER		sizeof(struct tp_finger)
-#define SIZEOF_ALL_FINGERS	(16 * SIZEOF_FINGER)
+#define SIZEOF_ALL_FINGERS	(MAX_FINGERS * SIZEOF_FINGER)
 #define MAX_FINGER_ORIENTATION	16384
 
 /* device-specific parameters */
@@ -480,13 +481,13 @@ static void report_finger_data(struct input_dev *input,
 			       const struct tp_finger *f)
 {
 	input_report_abs(input, ABS_MT_TOUCH_MAJOR,
-			 raw2int(f->force_major) << 1);
+			 raw2int(f->touch_major) << 1);
 	input_report_abs(input, ABS_MT_TOUCH_MINOR,
-			 raw2int(f->force_minor) << 1);
+			 raw2int(f->touch_minor) << 1);
 	input_report_abs(input, ABS_MT_WIDTH_MAJOR,
-			 raw2int(f->size_major) << 1);
+			 raw2int(f->tool_major) << 1);
 	input_report_abs(input, ABS_MT_WIDTH_MINOR,
-			 raw2int(f->size_minor) << 1);
+			 raw2int(f->tool_minor) << 1);
 	input_report_abs(input, ABS_MT_ORIENTATION,
 			 MAX_FINGER_ORIENTATION - raw2int(f->orientation));
 	input_report_abs(input, ABS_MT_POSITION_X, raw2int(f->abs_x));
@@ -519,8 +520,8 @@ static int report_tp_state(struct bcm5974 *dev, int size)
 		for (i = 0; i < raw_n; i++)
 			report_finger_data(input, c, &f[i]);
 
-		raw_p = raw2int(f->force_major);
-		raw_w = raw2int(f->size_major);
+		raw_p = raw2int(f->touch_major);
+		raw_w = raw2int(f->tool_major);
 		raw_x = raw2int(f->abs_x);
 		raw_y = raw2int(f->abs_y);
 
@@ -540,7 +541,7 @@ static int report_tp_state(struct bcm5974 *dev, int size)
 			abs_y = int2bound(&c->y, c->y.devmax - raw_y);
 			while (raw_n--) {
 				ptest = int2bound(&c->p,
-						  raw2int(f->force_major));
+						  raw2int(f->touch_major));
 				if (ptest > PRESSURE_LOW)
 					nmax++;
 				if (ptest > PRESSURE_HIGH)
-- 
1.7.12


  parent reply	other threads:[~2012-08-26 12:53 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-08-26 12:57 [PATCH v2 00/20] Input and HID updates for 3.7 Henrik Rydberg
2012-08-26 12:57 ` [PATCH 01/20] Input: bcm5974 - Only setup button urb for TYPE1 devices Henrik Rydberg
2012-08-26 12:57 ` [PATCH 02/20] Input: Break out MT data Henrik Rydberg
2012-08-26 12:57 ` [PATCH v2 03/20] Input: Improve the events-per-packet estimate Henrik Rydberg
2012-08-26 12:57 ` [PATCH 04/20] Input: Remove redundant packet estimates Henrik Rydberg
2012-08-26 12:57 ` [PATCH 05/20] Input: Make sure we follow all EV_KEY events Henrik Rydberg
2012-08-26 12:57 ` [PATCH 06/20] Input: Move autorepeat to the event-passing phase Henrik Rydberg
2012-08-26 12:57 ` [PATCH v2 07/20] Input: Send events one packet at a time Henrik Rydberg
2012-08-26 12:57 ` [PATCH 08/20] Input: evdev - Add the events() callback Henrik Rydberg
2012-08-26 12:57 ` [PATCH 09/20] Input: MT - Add flags to input_mt_init_slots() Henrik Rydberg
2012-08-26 12:57 ` [PATCH v2 10/20] Input: MT - Handle frame synchronization in core Henrik Rydberg
2012-08-26 12:57 ` [PATCH 11/20] Input: MT - Add in-kernel tracking Henrik Rydberg
2012-08-26 12:57 ` [PATCH 12/20] Input: MT - Add slot assignment by id Henrik Rydberg
2012-08-26 12:57 ` Henrik Rydberg [this message]
2012-08-26 12:57 ` [PATCH 14/20] Input: bcm5974 - Drop pressure and width emulation Henrik Rydberg
2012-08-26 12:57 ` [PATCH 15/20] Input: bcm5974 - Drop the logical dimensions Henrik Rydberg
2012-08-26 12:57 ` [PATCH 16/20] Input: bcm5974 - Convert to MT-B Henrik Rydberg
2012-08-26 12:57 ` [PATCH 17/20] HID: Only dump input if someone is listening Henrik Rydberg
2012-08-26 12:57 ` [PATCH 18/20] HID: Add an input configured notification callback Henrik Rydberg
2012-08-26 12:57 ` [PATCH 19/20] HID: hid-debug: Show rdesc for unclaimed devices Henrik Rydberg
2012-08-26 12:57 ` [PATCH v2 20/20] HID: multitouch: Remove the redundant touch state Henrik Rydberg
2012-08-29 15:18   ` Benjamin Tissoires
2012-08-29 16:02     ` Henrik Rydberg
2012-08-30 18:34     ` Henrik Rydberg

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=1345985858-445-14-git-send-email-rydberg@euromail.se \
    --to=rydberg@euromail.se \
    --cc=dmitry.torokhov@gmail.com \
    --cc=jkosina@suse.cz \
    --cc=linux-input@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).