Commit cf2f765f authored by Jiri Kosina's avatar Jiri Kosina
Browse files

HID: handle joysticks with large number of buttons 



Current HID code doesn't properly handle HID joysticks which have
larger number of buttons than what fits into current range reserved
for BTN_JOYSTICK.

One such joystick reported to not work properly is Saitek X52 Pro
Flight System.

We can't extend the range to fit more buttons in, because of backwards
compatibility reasons.

Therefore this patch introduces a new BTN_TRIGGER_HAPPY range, and
uses these to map the buttons which are over BTN_JOYSTICK limit.

Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> [for the input.h part]
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 92688c0c

drivers/hid/hid-input.c

+6 −1
Original line number Diff line number Diff line
@@ -198,7 +198,12 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel 
		switch (field->application) {

		case HID_GD_MOUSE:

		case HID_GD_POINTER:  code += 0x110; break;

		case HID_GD_JOYSTICK: code += 0x120; break;

		case HID_GD_JOYSTICK:

				      if (code <= 0xf)

					      code += BTN_JOYSTICK;

				      else

					      code += BTN_TRIGGER_HAPPY;

				      break;

		case HID_GD_GAMEPAD:  code += 0x130; break;

		default:

			switch (field->physical) {

include/linux/input.h

+42 −0
Original line number Diff line number Diff line
@@ -597,6 +597,48 @@ struct input_absinfo { 


#define KEY_CAMERA_FOCUS	0x210



#define BTN_TRIGGER_HAPPY		0x2c0

#define BTN_TRIGGER_HAPPY1		0x2c0

#define BTN_TRIGGER_HAPPY2		0x2c1

#define BTN_TRIGGER_HAPPY3		0x2c2

#define BTN_TRIGGER_HAPPY4		0x2c3

#define BTN_TRIGGER_HAPPY5		0x2c4

#define BTN_TRIGGER_HAPPY6		0x2c5

#define BTN_TRIGGER_HAPPY7		0x2c6

#define BTN_TRIGGER_HAPPY8		0x2c7

#define BTN_TRIGGER_HAPPY9		0x2c8

#define BTN_TRIGGER_HAPPY10		0x2c9

#define BTN_TRIGGER_HAPPY11		0x2ca

#define BTN_TRIGGER_HAPPY12		0x2cb

#define BTN_TRIGGER_HAPPY13		0x2cc

#define BTN_TRIGGER_HAPPY14		0x2cd

#define BTN_TRIGGER_HAPPY15		0x2ce

#define BTN_TRIGGER_HAPPY16		0x2cf

#define BTN_TRIGGER_HAPPY17		0x2d0

#define BTN_TRIGGER_HAPPY18		0x2d1

#define BTN_TRIGGER_HAPPY19		0x2d2

#define BTN_TRIGGER_HAPPY20		0x2d3

#define BTN_TRIGGER_HAPPY21		0x2d4

#define BTN_TRIGGER_HAPPY22		0x2d5

#define BTN_TRIGGER_HAPPY23		0x2d6

#define BTN_TRIGGER_HAPPY24		0x2d7

#define BTN_TRIGGER_HAPPY25		0x2d8

#define BTN_TRIGGER_HAPPY26		0x2d9

#define BTN_TRIGGER_HAPPY27		0x2da

#define BTN_TRIGGER_HAPPY28		0x2db

#define BTN_TRIGGER_HAPPY29		0x2dc

#define BTN_TRIGGER_HAPPY30		0x2dd

#define BTN_TRIGGER_HAPPY31		0x2de

#define BTN_TRIGGER_HAPPY32		0x2df

#define BTN_TRIGGER_HAPPY33		0x2e0

#define BTN_TRIGGER_HAPPY34		0x2e1

#define BTN_TRIGGER_HAPPY35		0x2e2

#define BTN_TRIGGER_HAPPY36		0x2e3

#define BTN_TRIGGER_HAPPY37		0x2e4

#define BTN_TRIGGER_HAPPY38		0x2e5

#define BTN_TRIGGER_HAPPY39		0x2e6

#define BTN_TRIGGER_HAPPY40		0x2e7



/* We avoid low common keys in module aliases so they don't get huge. */

#define KEY_MIN_INTERESTING	KEY_MUTE

#define KEY_MAX			0x2ff

CRA Git | Maintained and supported by SUSTech CRA and CCSE