diff options
| author | Jeff Brown <jeffbrown@google.com> | 2011-07-24 14:31:14 -0700 |
|---|---|---|
| committer | Jeff Brown <jeffbrown@google.com> | 2011-08-15 18:33:32 -0700 |
| commit | b3fe8ceed9c81686759388e34b675ddcd7463714 (patch) | |
| tree | b7034b9f7b9adf49440f85ebcfb534bc41d8897f /drivers/hid | |
| parent | 44906417e5e3afe3d033f84fd4cab05ba2cf6993 (diff) | |
| download | kernel_samsung_aries-b3fe8ceed9c81686759388e34b675ddcd7463714.zip kernel_samsung_aries-b3fe8ceed9c81686759388e34b675ddcd7463714.tar.gz kernel_samsung_aries-b3fe8ceed9c81686759388e34b675ddcd7463714.tar.bz2 | |
hid-multitouch: Filter collections by application usage.
This change fixes two problems.
First, it ensures that the hid-multitouch driver does not incorrectly
map GenericDesktop usages that are intended for other applications,
such as a Mouse.
Second, it sets the appropriate input properties so that user-space
can distinguish TouchScreen devices (INPUT_PROP_DIRECT) from
TouchPad devices (INPUT_PROP_POINTER) and configure them accordingly.
Change-Id: I8c2d947929186ffe7cf04b37c76e29b9abecf8cb
Signed-off-by: jeffbrown@android.com
Diffstat (limited to 'drivers/hid')
| -rw-r--r-- | drivers/hid/hid-multitouch.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c index 62cac4d..5de25ff 100644 --- a/drivers/hid/hid-multitouch.c +++ b/drivers/hid/hid-multitouch.c @@ -213,6 +213,16 @@ static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi, struct mt_class *cls = td->mtclass; __s32 quirks = cls->quirks; + /* Only map fields from TouchScreen or TouchPad collections. + * We need to ignore fields that belong to other collections + * such as Mouse that might have the same GenericDesktop usages. */ + if (field->application == HID_DG_TOUCHSCREEN) + set_bit(INPUT_PROP_DIRECT, hi->input->propbit); + else if (field->application == HID_DG_TOUCHPAD) + set_bit(INPUT_PROP_POINTER, hi->input->propbit); + else + return 0; + switch (usage->hid & HID_USAGE_PAGE) { case HID_UP_GENDESK: |