History

HID: multitouch: move ALWAYS_VALID quirk check

Win 8 device specification changed the requirements for the hid usages of the multitouch devices. Now InRange is optional and must be only used when the device supports hovering. This ensures that the quirk ALWAYS_VALID is taken into account and also ensures its precedence over the other VALID* quirks.

Benjamin Tissoires committed 14 years ago

Commit 20b60e61 parent 349fd671 file · +2 −4Browse files

Unified · Split

drivers/hid/hid-multitouch.c+2−4
@@ -502,7 +502,7 @@ static int mt_compute_slot(struct mt_device *td, struct input_dev *input) · 501 unmodified lines
502 */502 */
503static void mt_complete_slot(struct mt_device *td, struct input_dev *input)503static void mt_complete_slot(struct mt_device *td, struct input_dev *input)
504{504{
505 if (td->curvalid) {505 if (td->curvalid || (td->mtclass.quirks & MT_QUIRK_ALWAYS_VALID)) {
506 int slotnum = mt_compute_slot(td, input);506 int slotnum = mt_compute_slot(td, input);
507 struct mt_slot *s = &td->curdata;507 struct mt_slot *s = &td->curdata;
508 508
@@ -553,9 +553,7 @@ static int mt_event(struct hid_device *hid, struct hid_field *field, · 44 unmodified lines
553 if (hid->claimed & HID_CLAIMED_INPUT) {553 if (hid->claimed & HID_CLAIMED_INPUT) {
554 switch (usage->hid) {554 switch (usage->hid) {
555 case HID_DG_INRANGE:555 case HID_DG_INRANGE:
556 if (quirks & MT_QUIRK_ALWAYS_VALID)556 if (quirks & MT_QUIRK_VALID_IS_INRANGE)
557 td->curvalid = true;
558 else if (quirks & MT_QUIRK_VALID_IS_INRANGE)
559 td->curvalid = value;557 td->curvalid = value;
560 break;558 break;
561 case HID_DG_TIPSWITCH:559 case HID_DG_TIPSWITCH:

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t