HID: fix incorrect handling of devices with high button count
Button names for USB gamepads are currently assigned incorrectly, as the evdev code assigned to buttons is "BTN_GAMEPAD + code", which on devices with more then 16 buttons bleeds over into button names reserved for graphic tablets (BTN_TOOL_PEN, etc.). This causes problems further down the line as the device are now no longer detected as joystick. This patch fixes that by assigning buttons outside the range to BTN_TRIGGER_HAPPY (as is already the case for USB joysticks). Furthermore this patch corrects the assignment to BTN_TRIGGER_HAPPY, as currently the first button over 16 is assigned to BTN_TRIGGER_HAPPY17 (i.e. BTN_TRIGGER_HAPPY+0x10) not BTN_TRIGGER_HAPPY. Signed-off-by: Ingo Ruhnke <grumbel@gmail.com> Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
parent
c10354d4a6
commit
f8e86d0546
|
@ -502,9 +502,14 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
|
||||||
if (code <= 0xf)
|
if (code <= 0xf)
|
||||||
code += BTN_JOYSTICK;
|
code += BTN_JOYSTICK;
|
||||||
else
|
else
|
||||||
code += BTN_TRIGGER_HAPPY;
|
code += BTN_TRIGGER_HAPPY - 0x10;
|
||||||
|
break;
|
||||||
|
case HID_GD_GAMEPAD:
|
||||||
|
if (code <= 0xf)
|
||||||
|
code += BTN_GAMEPAD;
|
||||||
|
else
|
||||||
|
code += BTN_TRIGGER_HAPPY - 0x10;
|
||||||
break;
|
break;
|
||||||
case HID_GD_GAMEPAD: code += BTN_GAMEPAD; break;
|
|
||||||
default:
|
default:
|
||||||
switch (field->physical) {
|
switch (field->physical) {
|
||||||
case HID_GD_MOUSE:
|
case HID_GD_MOUSE:
|
||||||
|
|
Loading…
Reference in New Issue