From 5ab018df79a43865d4ab788a182f30e2fb94b181 Mon Sep 17 00:00:00 2001 From: Yaroslav Chvanov Date: Sat, 25 Feb 2023 14:05:03 +0300 Subject: [PATCH] libratbag: remove everything related to the deprecated ratbag_led_type --- src/libratbag-data.c | 11 ----------- src/libratbag-data.h | 3 --- src/libratbag-enums.h | 18 ------------------ src/libratbag-private.h | 3 --- src/libratbag.c | 27 --------------------------- 5 files changed, 62 deletions(-) diff --git a/src/libratbag-data.c b/src/libratbag-data.c index cdb0019a..dbf4b406 100644 --- a/src/libratbag-data.c +++ b/src/libratbag-data.c @@ -122,8 +122,6 @@ struct ratbag_device_data { struct data_steelseries steelseries; struct data_asus asus; }; - - enum ratbag_led_type led_types[20]; }; static void @@ -455,15 +453,6 @@ ratbag_device_data_get_device_type(const struct ratbag_device_data *data) return data->devicetype; } -enum ratbag_led_type -ratbag_device_data_get_led_type(const struct ratbag_device_data *data, - unsigned int index) -{ - assert(index < ARRAY_LENGTH(data->led_types)); - - return data->led_types[index]; -} - struct ratbag_device_data * ratbag_device_data_ref(struct ratbag_device_data *data) { diff --git a/src/libratbag-data.h b/src/libratbag-data.h index e4742238..1999a98e 100644 --- a/src/libratbag-data.h +++ b/src/libratbag-data.h @@ -44,9 +44,6 @@ const char * ratbag_device_data_get_name(const struct ratbag_device_data *data); enum ratbag_device_type ratbag_device_data_get_device_type(const struct ratbag_device_data *data); -enum ratbag_led_type -ratbag_device_data_get_led_type(const struct ratbag_device_data *data, - unsigned int index); /* HID++ 1.0 */ /** diff --git a/src/libratbag-enums.h b/src/libratbag-enums.h index 33282f1e..6fd8a92d 100644 --- a/src/libratbag-enums.h +++ b/src/libratbag-enums.h @@ -247,24 +247,6 @@ enum ratbag_led_mode { RATBAG_LED_BREATHING, }; -/** - * @ingroup enums - * - * LED types, usually based on their physical location - * - * This enum is deprecated and should not be used. - * - * @deprecated - */ -enum ratbag_led_type { - RATBAG_LED_TYPE_LOGO = 1, - RATBAG_LED_TYPE_SIDE, - RATBAG_LED_TYPE_BATTERY, - RATBAG_LED_TYPE_DPI, - RATBAG_LED_TYPE_WHEEL, - RATBAG_LED_TYPE_SWITCHES, -}; - /** * @ingroup enums */ diff --git a/src/libratbag-private.h b/src/libratbag-private.h index 80ce773d..8a510714 100644 --- a/src/libratbag-private.h +++ b/src/libratbag-private.h @@ -37,8 +37,6 @@ #error "libratbag relies on assert(). Do not define NDEBUG" #endif -#define RATBAG_LED_TYPE_UNKNOWN 0 - void log_msg_va(struct ratbag *ratbag, enum ratbag_log_priority priority, @@ -241,7 +239,6 @@ struct ratbag_led { struct list link; struct ratbag_profile *profile; unsigned index; - enum ratbag_led_type type; enum ratbag_led_mode mode; uint32_t modes; /**< supported modes */ struct ratbag_color color; diff --git a/src/libratbag.c b/src/libratbag.c index 647f1c75..adfe4883 100644 --- a/src/libratbag.c +++ b/src/libratbag.c @@ -309,29 +309,6 @@ ratbag_sanity_check_device(struct ratbag_device *device) goto out; } - /* Require LED to be the same type in each profile */ - ratbag_device_for_each_profile(device, profile) { - _cleanup_profile_ struct ratbag_profile *p0 = ratbag_device_get_profile(device, 0); - struct ratbag_led *led; - - - ratbag_profile_for_each_led(profile, led) { - _cleanup_led_ struct ratbag_led *p0_led = ratbag_profile_get_led(p0, led->index); - - assert(led->type != RATBAG_LED_TYPE_UNKNOWN); - - if (p0_led->type != led->type) { - log_bug_libratbag(ratbag, - "%s: mismatching LED types (profile %d led %d)\n", - device->name, - profile->index, - led->type); - goto out; - } - } - - } - rc = true; out: @@ -664,7 +641,6 @@ ratbag_create_button(struct ratbag_profile *profile, unsigned int index) static struct ratbag_led * ratbag_create_led(struct ratbag_profile *profile, unsigned int index) { - struct ratbag_device *device = profile->device; struct ratbag_led *led; led = zalloc(sizeof(*led)); @@ -672,9 +648,6 @@ ratbag_create_led(struct ratbag_profile *profile, unsigned int index) led->profile = profile; led->index = index; led->colordepth = RATBAG_LED_COLORDEPTH_RGB_888; - led->type = RATBAG_LED_TYPE_UNKNOWN; - if (device->data) - led->type = ratbag_device_data_get_led_type(device->data, led->index); list_append(&profile->leds, &led->link);