DrathOrg/libratbag-plus
1
0
Fork 0
forked from drath/libratbag
Code Pull Requests Activity

hidpp20: remove unused physical mapping button type

Browse Source 
The `name` field does seem useful for debugging, so I left it in place.
This commit is contained in:
Yaroslav Chvanov
2023-02-25 13:22:27 +03:00
parent 1b00f7031a
commit 6e3011d64f
3 changed files with 24 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
src/hidpp-generic.c
View File

@@ -121,36 +121,35 @@ static const struct hidpp20_1b04_action_mapping hidpp20_1b04_logical_mapping[] =
struct hidpp20_1b04_physical_mapping {
uint16_t value;
const char *name;
enum ratbag_button_type type;
};
#define BUTTON_PHYS_MAPPING(v_, n_, t_) \
{ v_, n_, t_ }
#define BUTTON_PHYS_MAPPING(v_, n_) \
{ v_, n_ }
static const struct hidpp20_1b04_physical_mapping hidpp20_1b04_physical_mapping[] =
{
BUTTON_PHYS_MAPPING(0, "None" , RATBAG_BUTTON_TYPE_UNKNOWN),
BUTTON_PHYS_MAPPING(1, "Volume Up" , RATBAG_BUTTON_TYPE_UNKNOWN),
BUTTON_PHYS_MAPPING(2, "Volume Down" , RATBAG_BUTTON_TYPE_UNKNOWN),
BUTTON_PHYS_MAPPING(3, "Mute" , RATBAG_BUTTON_TYPE_UNKNOWN),
BUTTON_PHYS_MAPPING(4, "Play/Pause" , RATBAG_BUTTON_TYPE_UNKNOWN),
BUTTON_PHYS_MAPPING(5, "Next" , RATBAG_BUTTON_TYPE_UNKNOWN),
BUTTON_PHYS_MAPPING(6, "Previous" , RATBAG_BUTTON_TYPE_UNKNOWN),
BUTTON_PHYS_MAPPING(7, "Stop" , RATBAG_BUTTON_TYPE_UNKNOWN),
BUTTON_PHYS_MAPPING(56, "Left Click" , RATBAG_BUTTON_TYPE_LEFT),
BUTTON_PHYS_MAPPING(57, "Right Click" , RATBAG_BUTTON_TYPE_RIGHT),
BUTTON_PHYS_MAPPING(58, "Middle Click" , RATBAG_BUTTON_TYPE_MIDDLE),
BUTTON_PHYS_MAPPING(59, "Wheel Side Click Left" , RATBAG_BUTTON_TYPE_UNKNOWN),
BUTTON_PHYS_MAPPING(60, "Back Click" , RATBAG_BUTTON_TYPE_SIDE),
BUTTON_PHYS_MAPPING(61, "Wheel Side Click Right", RATBAG_BUTTON_TYPE_UNKNOWN),
BUTTON_PHYS_MAPPING(62, "Forward Click" , RATBAG_BUTTON_TYPE_EXTRA),
BUTTON_PHYS_MAPPING(63, "Left Scroll" , RATBAG_BUTTON_TYPE_WHEEL_LEFT),
BUTTON_PHYS_MAPPING(64, "Right Scroll" , RATBAG_BUTTON_TYPE_WHEEL_RIGHT),
BUTTON_PHYS_MAPPING(98, "Do Nothing" , RATBAG_BUTTON_TYPE_UNKNOWN),
BUTTON_PHYS_MAPPING(156, "Gesture Button" , RATBAG_BUTTON_TYPE_UNKNOWN),
BUTTON_PHYS_MAPPING(157, "SmartShift" , RATBAG_BUTTON_TYPE_WHEEL_RATCHET_MODE_SHIFT),
BUTTON_PHYS_MAPPING(169, "Gesture Button" , RATBAG_BUTTON_TYPE_MIDDLE),
BUTTON_PHYS_MAPPING(221, "LedToggle" , RATBAG_BUTTON_TYPE_UNKNOWN),
BUTTON_PHYS_MAPPING(0, "None"),
BUTTON_PHYS_MAPPING(1, "Volume Up"),
BUTTON_PHYS_MAPPING(2, "Volume Down"),
BUTTON_PHYS_MAPPING(3, "Mute"),
BUTTON_PHYS_MAPPING(4, "Play/Pause"),
BUTTON_PHYS_MAPPING(5, "Next"),
BUTTON_PHYS_MAPPING(6, "Previous"),
BUTTON_PHYS_MAPPING(7, "Stop"),
BUTTON_PHYS_MAPPING(56, "Left Click"),
BUTTON_PHYS_MAPPING(57, "Right Click"),
BUTTON_PHYS_MAPPING(58, "Middle Click"),
BUTTON_PHYS_MAPPING(59, "Wheel Side Click Left"),
BUTTON_PHYS_MAPPING(60, "Back Click"),
BUTTON_PHYS_MAPPING(61, "Wheel Side Click Right"),
BUTTON_PHYS_MAPPING(62, "Forward Click"),
BUTTON_PHYS_MAPPING(63, "Left Scroll"),
BUTTON_PHYS_MAPPING(64, "Right Scroll"),
BUTTON_PHYS_MAPPING(98, "Do Nothing"),
BUTTON_PHYS_MAPPING(156, "Gesture Button"),
BUTTON_PHYS_MAPPING(157, "SmartShift"),
BUTTON_PHYS_MAPPING(169, "Gesture Button"),
BUTTON_PHYS_MAPPING(221, "LedToggle"),
};
struct hidpp20_8070_location_mapping {
@@ -207,19 +206,6 @@ hidpp20_1b04_get_logical_mapping_name(uint16_t value)
return "UNKNOWN";
}
enum ratbag_button_type
hidpp20_1b04_get_physical_mapping(uint16_t value)
{
const struct hidpp20_1b04_physical_mapping *map;
ARRAY_FOR_EACH(hidpp20_1b04_physical_mapping, map) {
if (map->value == value)
return map->type;
}
return RATBAG_BUTTON_TYPE_UNKNOWN;
}
const char *
hidpp20_1b04_get_physical_mapping_name(uint16_t value)
{

3
src/hidpp-generic.h
View File

@@ -126,9 +126,6 @@ extern const char *hidpp20_errors[0x100];
const char *
hidpp20_1b04_get_physical_mapping_name(uint16_t value);
enum ratbag_button_type
hidpp20_1b04_get_physical_mapping(uint16_t value);
enum ratbag_led_type
hidpp20_led_get_location_mapping(uint16_t value);

1
src/hidpp20.h
View File

@@ -358,7 +358,6 @@ int hidpp20_special_key_mouse_set_control(struct hidpp20_device *device,
const struct ratbag_button_action *hidpp20_1b04_get_logical_mapping(uint16_t value);
uint16_t hidpp20_1b04_get_logical_control_id(const struct ratbag_button_action *action);
const char *hidpp20_1b04_get_logical_mapping_name(uint16_t value);
enum ratbag_button_type hidpp20_1b04_get_physical_mapping(uint16_t value);
const char *hidpp20_1b04_get_physical_mapping_name(uint16_t value);
/* -------------------------------------------------------------------------- */