mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-11 12:28:41 +08:00
HID: ite: Enable QUIRK_TOUCHPAD_ON_OFF_REPORT on Acer Aspire Switch 10E
The Acer Aspire Switch 10E (SW3-016)'s keyboard-dock uses the same USB-ids as the Acer One S1003 keyboard-dock. Yet they are not entirely the same: 1. The S1003 keyboard-dock has the same report descriptors as the S1002 keyboard-dock (which has different USB-ids) 2. The Acer Aspire Switch 10E's keyboard-dock has different report descriptors from the S1002/S1003 keyboard docks and it sends 0x00880078 / 0x00880079 usage events when the touchpad is toggled on/off (which is handled internally). This means that all Acer kbd-docks handled by the hid-ite.c drivers report their touchpad being toggled on/off through these custom usage-codes with the exception of the S1003 dock, which likely is a bug of that dock. Add a QUIRK_TOUCHPAD_ON_OFF_REPORT quirk for the Aspire Switch 10E / S1003 usb-id so that the touchpad toggling will get reported to userspace on the Aspire Switch 10E. Since the Aspire Switch 10E's kbd-dock has different report-descriptors, this also requires adding support for fixing those to ite_report_fixup(). Setting the quirk will also cause ite_report_fixup() to hit the S1002/S1003 descriptors path on the S1003. Since the S1003 kbd-dock never generates any input-reports for the fixed up part of the descriptors this does not matter; and if there are versions out there which do actually send input-reports for the touchpad-toggle then the fixup should actually help to make things work. This was tested on both an Acer Aspire Switch 10E and on an Acer One S1003. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
parent
decfe496fe
commit
b7c20f3815
@ -23,11 +23,16 @@ static __u8 *ite_report_fixup(struct hid_device *hdev, __u8 *rdesc, unsigned int
|
|||||||
hid_info(hdev, "Fixing up Acer Sw5-012 ITE keyboard report descriptor\n");
|
hid_info(hdev, "Fixing up Acer Sw5-012 ITE keyboard report descriptor\n");
|
||||||
rdesc[163] = HID_MAIN_ITEM_RELATIVE;
|
rdesc[163] = HID_MAIN_ITEM_RELATIVE;
|
||||||
}
|
}
|
||||||
/* For Acer One S1002 keyboard-dock */
|
/* For Acer One S1002/S1003 keyboard-dock */
|
||||||
if (*rsize == 188 && rdesc[185] == 0x81 && rdesc[186] == 0x02) {
|
if (*rsize == 188 && rdesc[185] == 0x81 && rdesc[186] == 0x02) {
|
||||||
hid_info(hdev, "Fixing up Acer S1002 ITE keyboard report descriptor\n");
|
hid_info(hdev, "Fixing up Acer S1002/S1003 ITE keyboard report descriptor\n");
|
||||||
rdesc[186] = HID_MAIN_ITEM_RELATIVE;
|
rdesc[186] = HID_MAIN_ITEM_RELATIVE;
|
||||||
}
|
}
|
||||||
|
/* For Acer Aspire Switch 10E (SW3-016) keyboard-dock */
|
||||||
|
if (*rsize == 210 && rdesc[184] == 0x81 && rdesc[185] == 0x02) {
|
||||||
|
hid_info(hdev, "Fixing up Acer Aspire Switch 10E (SW3-016) ITE keyboard report descriptor\n");
|
||||||
|
rdesc[185] = HID_MAIN_ITEM_RELATIVE;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return rdesc;
|
return rdesc;
|
||||||
@ -114,7 +119,8 @@ static const struct hid_device_id ite_devices[] = {
|
|||||||
/* ITE8910 USB kbd ctlr, with Synaptics touchpad connected to it. */
|
/* ITE8910 USB kbd ctlr, with Synaptics touchpad connected to it. */
|
||||||
{ HID_DEVICE(BUS_USB, HID_GROUP_GENERIC,
|
{ HID_DEVICE(BUS_USB, HID_GROUP_GENERIC,
|
||||||
USB_VENDOR_ID_SYNAPTICS,
|
USB_VENDOR_ID_SYNAPTICS,
|
||||||
USB_DEVICE_ID_SYNAPTICS_ACER_ONE_S1003) },
|
USB_DEVICE_ID_SYNAPTICS_ACER_ONE_S1003),
|
||||||
|
.driver_data = QUIRK_TOUCHPAD_ON_OFF_REPORT },
|
||||||
{ }
|
{ }
|
||||||
};
|
};
|
||||||
MODULE_DEVICE_TABLE(hid, ite_devices);
|
MODULE_DEVICE_TABLE(hid, ite_devices);
|
||||||
|
Loading…
Reference in New Issue
Block a user