[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1301727259-5185-1-git-send-email-jeffbrown@android.com>
Date: Fri, 1 Apr 2011 23:54:16 -0700
From: Jeff Brown <jeffbrown@...roid.com>
To: dmitry.torokhov@...il.com, rydberg@...omail.se, djkurtz@...gle.com
Cc: linux-input@...r.kernel.org, linux-kernel@...r.kernel.org,
Jeff Brown <jeffbrown@...gle.com>, jeffbrown@...roid.com
Subject: [PATCH v2 1/4] input: Set default events per packet.
From: Jeff Brown <jeffbrown@...gle.com>
Calculate a default based on the number of ABS axes, REL axes,
and MT slots for the device during input device registration.
Signed-off-by: jeffbrown@...roid.com
---
drivers/input/input.c | 40 ++++++++++++++++++++++++++++++++++++++++
include/linux/input/mt.h | 6 ++++++
2 files changed, 46 insertions(+), 0 deletions(-)
diff --git a/drivers/input/input.c b/drivers/input/input.c
index d6e8bd8..53fccee 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -1746,6 +1746,43 @@ void input_set_capability(struct input_dev *dev, unsigned int type, unsigned int
}
EXPORT_SYMBOL(input_set_capability);
+static void input_set_default_events_per_packet(struct input_dev *dev)
+{
+ int mt_slots;
+ int i;
+ int events;
+
+ if (dev->hint_events_per_packet)
+ return;
+
+ if (dev->mtsize)
+ mt_slots = dev->mtsize;
+ else if (test_bit(ABS_MT_TRACKING_ID, dev->absbit))
+ mt_slots = min(dev->absinfo[ABS_MT_TRACKING_ID].maximum -
+ dev->absinfo[ABS_MT_TRACKING_ID].minimum + 1, 32);
+ else if (test_bit(ABS_MT_POSITION_X, dev->absbit))
+ mt_slots = 2;
+ else
+ mt_slots = 0;
+
+ events = mt_slots + 1; /* count SYN_MT_REPORT and SYN_REPORT */
+
+ for (i = 0; i < ABS_CNT; i++) {
+ if (test_bit(i, dev->absbit)) {
+ if (is_mt_axis(i))
+ events += mt_slots;
+ else
+ events++;
+ }
+ }
+
+ for (i = 0; i < REL_CNT; i++)
+ if (test_bit(i, dev->relbit))
+ events++;
+
+ input_set_events_per_packet(dev, events);
+}
+
#define INPUT_CLEANSE_BITMASK(dev, type, bits) \
do { \
if (!test_bit(EV_##type, dev->evbit)) \
@@ -1784,6 +1821,9 @@ int input_register_device(struct input_dev *dev)
const char *path;
int error;
+ /* Use a larger default input buffer for MT devices */
+ input_set_default_events_per_packet(dev);
+
/* Every input device generates EV_SYN/SYN_REPORT events. */
__set_bit(EV_SYN, dev->evbit);
diff --git a/include/linux/input/mt.h b/include/linux/input/mt.h
index b3ac06a..0ef2f87 100644
--- a/include/linux/input/mt.h
+++ b/include/linux/input/mt.h
@@ -48,6 +48,12 @@ static inline void input_mt_slot(struct input_dev *dev, int slot)
input_event(dev, EV_ABS, ABS_MT_SLOT, slot);
}
+static inline bool is_mt_axis(int axis)
+{
+ return axis == ABS_MT_SLOT ||
+ (axis >= ABS_MT_FIRST && axis <= ABS_MT_LAST);
+}
+
void input_mt_report_slot_state(struct input_dev *dev,
unsigned int tool_type, bool active);
--
1.7.0.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists