From e908871e82b78d512ea124fefea429b5e432a4e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filipe=20La=C3=ADns?= Date: Mon, 11 Oct 2021 00:14:02 +0100 Subject: [PATCH] hidpp20: allow setting a default report rate (#969) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In case we can't get the report rate value from the device, allow setting in the device file. Signed-off-by: Filipe Laíns --- data/devices/data-parse-test.py | 2 +- src/driver-hidpp20.c | 4 +++- src/libratbag-data.c | 16 ++++++++++++++++ src/libratbag-data.h | 3 +++ 4 files changed, 23 insertions(+), 2 deletions(-) diff --git a/data/devices/data-parse-test.py b/data/devices/data-parse-test.py index d1287830..71d4fa11 100755 --- a/data/devices/data-parse-test.py +++ b/data/devices/data-parse-test.py @@ -168,7 +168,7 @@ def check_section_hidpp10(section): def check_section_hidpp20(section): - permitted = ['DeviceIndex', 'Leds', 'Quirk'] + permitted = ['DeviceIndex', 'Leds', 'ReportRate', 'Quirk'] for key in section.keys(): assertIn(key, permitted) diff --git a/src/driver-hidpp20.c b/src/driver-hidpp20.c index 905a47a1..34300328 100644 --- a/src/driver-hidpp20.c +++ b/src/driver-hidpp20.c @@ -957,7 +957,7 @@ hidpp20drv_read_resolution_dpi(struct ratbag_profile *profile) if (drv_data->capabilities & HIDPP_CAP_ADJUSTIBLE_REPORT_RATE_8060) { rc = hidpp20drv_read_report_rate_8060(device); - if (rc < 0) + if (rc < 0 && drv_data->report_rates[0] == 0) return rc; ratbag_profile_set_report_rate_list(profile, @@ -1642,6 +1642,8 @@ hidpp20drv_init_device(struct ratbag_device *device, if (num >= 0) drv_data->num_leds = num; + drv_data->report_rates[0] = ratbag_device_data_hidpp20_get_report_rate(device->data);; + ratbag_device_init_profiles(device, drv_data->num_profiles, drv_data->num_resolutions, diff --git a/src/libratbag-data.c b/src/libratbag-data.c index 57afdccd..88f18a34 100644 --- a/src/libratbag-data.c +++ b/src/libratbag-data.c @@ -63,6 +63,7 @@ struct data_hidpp20 { int index; enum hidpp20_quirk quirk; int led_count; + int report_rate; }; struct data_hidpp10 { @@ -179,6 +180,13 @@ init_data_hidpp20(struct ratbag *ratbag, if (error) g_error_free(error); + error = NULL; + num = g_key_file_get_integer(keyfile, group, "ReportRate", &error); + if (num > 0 || !error) + data->hidpp20.report_rate = num; + if (error) + g_error_free(error); + str = g_key_file_get_string(keyfile, group, "Quirk", NULL); data->hidpp20.quirk = HIDPP20_QUIRK_NONE; if (str) { @@ -606,6 +614,14 @@ ratbag_device_data_hidpp20_get_led_count(const struct ratbag_device_data *data) return data->hidpp20.led_count; } +int +ratbag_device_data_hidpp20_get_report_rate(const struct ratbag_device_data *data) +{ + assert(data->drivertype == HIDPP20); + + return data->hidpp20.report_rate; +} + enum hidpp20_quirk ratbag_device_data_hidpp20_get_quirk(const struct ratbag_device_data *data) { diff --git a/src/libratbag-data.h b/src/libratbag-data.h index ffb4b266..af57aa1b 100644 --- a/src/libratbag-data.h +++ b/src/libratbag-data.h @@ -83,6 +83,9 @@ ratbag_device_data_hidpp20_get_index(const struct ratbag_device_data *data); int ratbag_device_data_hidpp20_get_led_count(const struct ratbag_device_data *data); +int +ratbag_device_data_hidpp20_get_report_rate(const struct ratbag_device_data *data); + enum hidpp20_quirk ratbag_device_data_hidpp20_get_quirk(const struct ratbag_device_data *data);