Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc55e952 authored by Anssi Hannula's avatar Anssi Hannula Committed by Dmitry Torokhov
Browse files

Input: xpad - do not report nonexistent buttons for xbox360 



The buttons BTN_C and BTN_Z are only used in the original xbox
controller, not in xbox360 controller. Therefore only add them to
keybit when the controller is a non-360 one.

Signed-off-by: default avatarAnssi Hannula <anssi.hannula@gmail.com>
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent 8a7ae2a8

drivers/input/joystick/xpad.c

+14 −4
Original line number Diff line number Diff line
@@ -144,12 +144,19 @@ static const struct xpad_device { 
	{ 0x0000, 0x0000, "Generic X-Box pad", MAP_DPAD_UNKNOWN, XTYPE_UNKNOWN }

};



static const signed short xpad_btn[] = {

	BTN_A, BTN_B, BTN_C, BTN_X, BTN_Y, BTN_Z,	/* "analog" buttons */

/* buttons shared with xbox and xbox360 */

static const signed short xpad_common_btn[] = {

	BTN_A, BTN_B, BTN_X, BTN_Y,			/* "analog" buttons */

	BTN_START, BTN_BACK, BTN_THUMBL, BTN_THUMBR,	/* start/back/sticks */

	-1						/* terminating entry */

};



/* original xbox controllers only */

static const signed short xpad_btn[] = {

	BTN_C, BTN_Z,		/* "analog" buttons */

	-1			/* terminating entry */

};



/* only used if MAP_DPAD_TO_BUTTONS */

static const signed short xpad_btn_pad[] = {

	BTN_LEFT, BTN_RIGHT,		/* d-pad left, right */
@@ -679,11 +686,14 @@ static int xpad_probe(struct usb_interface *intf, const struct usb_device_id *id 
	input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);



	/* set up buttons */

	for (i = 0; xpad_btn[i] >= 0; i++)

		set_bit(xpad_btn[i], input_dev->keybit);

	for (i = 0; xpad_common_btn[i] >= 0; i++)

		set_bit(xpad_common_btn[i], input_dev->keybit);

	if (xpad->xtype == XTYPE_XBOX360)

		for (i = 0; xpad360_btn[i] >= 0; i++)

			set_bit(xpad360_btn[i], input_dev->keybit);

	else

		for (i = 0; xpad_btn[i] >= 0; i++)

			set_bit(xpad_btn[i], input_dev->keybit);

	if (xpad->dpad_mapping == MAP_DPAD_TO_BUTTONS)

		for (i = 0; xpad_btn_pad[i] >= 0; i++)

			set_bit(xpad_btn_pad[i], input_dev->keybit);