Commit f9b2e603 authored by Vicki Pfau's avatar Vicki Pfau Committed by Dmitry Torokhov
Browse files

Input: xpad - add constants for GIP interface numbers 



Wired GIP devices present multiple interfaces with the same USB identification
other than the interface number. This adds constants for differentiating two of
them and uses them where appropriate

Signed-off-by: default avatarVicki Pfau <vi@endrift.com>
Link: https://lore.kernel.org/r/20230411031650.960322-2-vi@endrift.com


Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent d6e68083

drivers/input/joystick/xpad.c

+4 −1
Original line number Diff line number Diff line
@@ -561,6 +561,9 @@ struct xboxone_init_packet { 
#define GIP_MOTOR_LT BIT(3)

#define GIP_MOTOR_ALL (GIP_MOTOR_R | GIP_MOTOR_L | GIP_MOTOR_RT | GIP_MOTOR_LT)



#define GIP_WIRED_INTF_DATA 0

#define GIP_WIRED_INTF_AUDIO 1



/*

 * This packet is required for all Xbox One pads with 2015

 * or later firmware installed (or present from the factory).
@@ -2004,7 +2007,7 @@ static int xpad_probe(struct usb_interface *intf, const struct usb_device_id *id 
	}



	if (xpad->xtype == XTYPE_XBOXONE &&

	    intf->cur_altsetting->desc.bInterfaceNumber != 0) {

	    intf->cur_altsetting->desc.bInterfaceNumber != GIP_WIRED_INTF_DATA) {

		/*

		 * The Xbox One controller lists three interfaces all with the

		 * same interface class, subclass and protocol. Differentiate by