From 64dbfaa14af10d99d31ad39a0a048b97e1dca738 Mon Sep 17 00:00:00 2001 From: Yaroslav Chvanov Date: Sat, 25 Feb 2023 13:00:00 +0300 Subject: [PATCH] hidpp10: remove support for the deprecated button type field --- src/driver-hidpp10.c | 68 +------------------------------------------- 1 file changed, 1 insertion(+), 67 deletions(-) diff --git a/src/driver-hidpp10.c b/src/driver-hidpp10.c index 14230a34..2c0c5bde 100644 --- a/src/driver-hidpp10.c +++ b/src/driver-hidpp10.c @@ -215,86 +215,20 @@ hidpp10drv_map_button(struct ratbag_device *device, static void hidpp10drv_read_button(struct ratbag_button *button) { - enum ratbag_button_type type = RATBAG_BUTTON_TYPE_UNKNOWN; struct ratbag_device *device = button->profile->device; struct hidpp10drv_data *drv_data = ratbag_get_drv_data(device); struct hidpp10_device *hidpp10 = drv_data->dev; switch (hidpp10->profile_type) { case HIDPP10_PROFILE_G500: - switch (button->index) { - case 0: type = RATBAG_BUTTON_TYPE_LEFT; break; - case 1: type = RATBAG_BUTTON_TYPE_MIDDLE; break; - case 2: type = RATBAG_BUTTON_TYPE_RIGHT; break; - case 3: type = RATBAG_BUTTON_TYPE_THUMB; break; - case 4: type = RATBAG_BUTTON_TYPE_THUMB2; break; - case 5: type = RATBAG_BUTTON_TYPE_THUMB3; break; - case 6: type = RATBAG_BUTTON_TYPE_WHEEL_LEFT; break; - case 7: type = RATBAG_BUTTON_TYPE_WHEEL_RIGHT; break; - case 8: type = RATBAG_BUTTON_TYPE_RESOLUTION_UP; break; - case 9: type = RATBAG_BUTTON_TYPE_RESOLUTION_DOWN; break; - case 10: - case 11: - case 12: /* these don't actually exist on the device */ - type = RATBAG_BUTTON_TYPE_UNKNOWN; break; - default: - break; - } - hidpp10drv_map_button(device, hidpp10, button); - break; case HIDPP10_PROFILE_G700: - switch (button->index) { - case 0: type = RATBAG_BUTTON_TYPE_LEFT; break; - case 1: type = RATBAG_BUTTON_TYPE_MIDDLE; break; - case 2: type = RATBAG_BUTTON_TYPE_RIGHT; break; - case 3: type = RATBAG_BUTTON_TYPE_THUMB; break; - case 4: type = RATBAG_BUTTON_TYPE_THUMB2; break; - case 5: type = RATBAG_BUTTON_TYPE_THUMB3; break; - case 6: type = RATBAG_BUTTON_TYPE_THUMB4; break; - case 7: type = RATBAG_BUTTON_TYPE_RESOLUTION_CYCLE_UP; break; - case 8: type = RATBAG_BUTTON_TYPE_RESOLUTION_DOWN; break; - case 9: type = RATBAG_BUTTON_TYPE_RESOLUTION_UP; break; - case 10: type = RATBAG_BUTTON_TYPE_PROFILE_CYCLE_UP; break; - case 11: type = RATBAG_BUTTON_TYPE_WHEEL_LEFT; break; - case 12: type = RATBAG_BUTTON_TYPE_WHEEL_RIGHT; break; - default: - break; - } - hidpp10drv_map_button(device, hidpp10, button); - break; case HIDPP10_PROFILE_G9: - switch (button->index) { - case 0: type = RATBAG_BUTTON_TYPE_LEFT; break; - case 1: type = RATBAG_BUTTON_TYPE_RIGHT; break; - case 2: type = RATBAG_BUTTON_TYPE_MIDDLE; break; - case 3: type = RATBAG_BUTTON_TYPE_THUMB; break; - case 4: type = RATBAG_BUTTON_TYPE_THUMB2; break; - case 5: type = RATBAG_BUTTON_TYPE_UNKNOWN; break; - case 6: type = RATBAG_BUTTON_TYPE_WHEEL_LEFT; break; - case 7: type = RATBAG_BUTTON_TYPE_WHEEL_RIGHT; break; - case 8: type = RATBAG_BUTTON_TYPE_RESOLUTION_UP; break; - case 9: type = RATBAG_BUTTON_TYPE_RESOLUTION_DOWN; break; - case 10: - case 11: - case 12: /* these don't actually exist on the device */ - type = RATBAG_BUTTON_TYPE_UNKNOWN; break; - default: - break; - } hidpp10drv_map_button(device, hidpp10, button); break; default: - switch (button->index) { - case 0: type = RATBAG_BUTTON_TYPE_LEFT; break; - case 1: type = RATBAG_BUTTON_TYPE_MIDDLE; break; - case 2: type = RATBAG_BUTTON_TYPE_RIGHT; break; - default: - break; - } + break; } - button->type = type; - ratbag_button_enable_action_type(button, RATBAG_BUTTON_ACTION_TYPE_NONE); ratbag_button_enable_action_type(button, RATBAG_BUTTON_ACTION_TYPE_BUTTON); ratbag_button_enable_action_type(button, RATBAG_BUTTON_ACTION_TYPE_KEY);