| From 8896022802532cb696d244706b0f23bc5a54feb8 Mon Sep 17 00:00:00 2001 |
| From: Pavel Rojtberg <rojtberg@gmail.com> |
| Date: Fri, 27 May 2016 16:24:40 -0700 |
| Subject: Input: xpad - xbox one elite controller support |
| |
| [ Upstream commit 6f49a398b266d4895bd7e041db77a2b2ee1482a6 ] |
| |
| added the according id and incresed XPAD_PKT_LEN to 64 as the elite |
| controller sends at least 33 byte messages [1]. |
| Verified to be working by [2]. |
| |
| [1]: https://franticrain.github.io/sniffs/XboxOneSniff.html |
| [2]: https://github.com/paroj/xpad/issues/23 |
| |
| Signed-off-by: Pierre-Loup A. Griffais <eduke32@plagman.net> |
| Signed-off-by: Pavel Rojtberg <rojtberg@gmail.com> |
| Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/input/joystick/xpad.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c |
| index c8897fc3202c..dcf9053a801e 100644 |
| --- a/drivers/input/joystick/xpad.c |
| +++ b/drivers/input/joystick/xpad.c |
| @@ -87,7 +87,7 @@ |
| #define DRIVER_AUTHOR "Marko Friedemann <mfr@bmx-chemnitz.de>" |
| #define DRIVER_DESC "X-Box pad driver" |
| |
| -#define XPAD_PKT_LEN 32 |
| +#define XPAD_PKT_LEN 64 |
| |
| /* xbox d-pads should map to buttons, as is required for DDR pads |
| but we map them to axes when possible to simplify things */ |
| @@ -129,6 +129,7 @@ static const struct xpad_device { |
| { 0x045e, 0x028e, "Microsoft X-Box 360 pad", 0, XTYPE_XBOX360 }, |
| { 0x045e, 0x02d1, "Microsoft X-Box One pad", 0, XTYPE_XBOXONE }, |
| { 0x045e, 0x02dd, "Microsoft X-Box One pad (Firmware 2015)", 0, XTYPE_XBOXONE }, |
| + { 0x045e, 0x02e3, "Microsoft X-Box One Elite pad", 0, XTYPE_XBOXONE }, |
| { 0x045e, 0x0291, "Xbox 360 Wireless Receiver (XBOX)", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360W }, |
| { 0x045e, 0x0719, "Xbox 360 Wireless Receiver", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360W }, |
| { 0x044f, 0x0f07, "Thrustmaster, Inc. Controller", 0, XTYPE_XBOX }, |
| -- |
| 2.17.1 |
| |
