korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-18 01:34:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

HID: logitech-hidpp: Support WirelessDeviceStatus connect events

Browse Source 
This patch allows hidpp_report_is_connect_event to support
WirelessDeviceStatus connect events.

The WirelessDeviceStatus feature index is stored in hidpp_device when
probed. The connect event's fap feature_index is compared against it if the
device supports it.

Signed-off-by: Mazin Rezk <mnrzk@protonmail.com>
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
This commit is contained in:
Mazin Rezk 2019-10-27 17:44:13 +00:00 committed by Benjamin Tissoires
parent c2a932717a
commit 0da0a63b7c
1 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
drivers/hid/hid-logitech-hidpp.c
View File

@ -191,6 +191,8 @@ struct hidpp_device {
struct hidpp_battery battery; struct hidpp_battery battery;
struct hidpp_scroll_counter vertical_wheel_counter; struct hidpp_scroll_counter vertical_wheel_counter;
u8 wireless_feature_index;
}; };
/* HID++ 1.0 error codes */ /* HID++ 1.0 error codes */
@ -403,10 +405,13 @@ static inline bool hidpp_match_error(struct hidpp_report *question,
(answer->fap.params[0] == question->fap.funcindex_clientid); (answer->fap.params[0] == question->fap.funcindex_clientid);
} }
static inline bool hidpp_report_is_connect_event(struct hidpp_report *report) static inline bool hidpp_report_is_connect_event(struct hidpp_device *hidpp,
struct hidpp_report *report)
{ {
return (report->report_id == REPORT_ID_HIDPP_SHORT) && return (hidpp->wireless_feature_index &&
(report->rap.sub_id == 0x41); (report->fap.feature_index == hidpp->wireless_feature_index)) ||
((report->report_id == REPORT_ID_HIDPP_SHORT) &&
(report->rap.sub_id == 0x41));
} }
/** /**
@ -1286,6 +1291,24 @@ static int hidpp_battery_get_property(struct power_supply *psy,
return ret; return ret;
} }
/* -------------------------------------------------------------------------- */
/* 0x1d4b: Wireless device status */
/* -------------------------------------------------------------------------- */
#define HIDPP_PAGE_WIRELESS_DEVICE_STATUS 0x1d4b
static int hidpp_set_wireless_feature_index(struct hidpp_device *hidpp)
{
u8 feature_type;
int ret;
ret = hidpp_root_get_feature(hidpp,
HIDPP_PAGE_WIRELESS_DEVICE_STATUS,
&hidpp->wireless_feature_index,
&feature_type);
return ret;
}
/* -------------------------------------------------------------------------- */ /* -------------------------------------------------------------------------- */
/* 0x2120: Hi-resolution scrolling */ /* 0x2120: Hi-resolution scrolling */
/* -------------------------------------------------------------------------- */ /* -------------------------------------------------------------------------- */
@ -3101,7 +3124,7 @@ static int hidpp_raw_hidpp_event(struct hidpp_device *hidpp, u8 *data,
} }
} }
if (unlikely(hidpp_report_is_connect_event(report))) { if (unlikely(hidpp_report_is_connect_event(hidpp, report))) {
atomic_set(&hidpp->connected, atomic_set(&hidpp->connected,
!(report->rap.params[0] & (1 << 6))); !(report->rap.params[0] & (1 << 6)));
if (schedule_work(&hidpp->work) == 0) if (schedule_work(&hidpp->work) == 0)
@ -3652,6 +3675,14 @@ static int hidpp_probe(struct hid_device *hdev, const struct hid_device_id *id)
hidpp_overwrite_name(hdev); hidpp_overwrite_name(hdev);
} }
if (connected && hidpp->protocol_major >= 2) {
ret = hidpp_set_wireless_feature_index(hidpp);
if (ret == -ENOENT)
hidpp->wireless_feature_index = 0;
else if (ret)
goto hid_hw_init_fail;
}
if (connected && (hidpp->quirks & HIDPP_QUIRK_CLASS_WTP)) { if (connected && (hidpp->quirks & HIDPP_QUIRK_CLASS_WTP)) {
ret = wtp_get_config(hidpp); ret = wtp_get_config(hidpp);
if (ret) if (ret)