| Message ID | 20200422075206.18229-1-priv.luk@gmail.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 764f7f911bf72450c51eb74cbb262ad9933741d8 |
| Headers | show |
| Series | Input: xpad - Add custom init packet for Xbox One S controllers | expand |
On 4/22/20 12:52 AM, LuK1337 wrote: > From: Łukasz Patron <priv.luk@gmail.com> > > Sending [ 0x05, 0x20, 0x00, 0x0f, 0x06 ] packet for > Xbox One S controllers fixes an issue where controller > is stuck in Bluetooth mode and not sending any inputs. > > Signed-off-by: Łukasz Patron <priv.luk@gmail.com> > Cc: stable@vger.kernel.org LGTM. Tested working on both of my Xbox One S gamepads: - idVendor=045e, idProduct=02ea, bcdDevice= 3.01 - idVendor=045e, idProduct=02ea, bcdDevice= 4.08 Reviewed-by: Cameron Gutman <aicommander@gmail.com> > --- > drivers/input/joystick/xpad.c | 12 ++++++++++++ > 1 file changed, 12 insertions(+) > > diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c > index 6b40a1c68f9f..c77cdb3b62b5 100644 > --- a/drivers/input/joystick/xpad.c > +++ b/drivers/input/joystick/xpad.c > @@ -458,6 +458,16 @@ static const u8 xboxone_fw2015_init[] = { > 0x05, 0x20, 0x00, 0x01, 0x00 > }; > > +/* > + * This packet is required for Xbox One S (0x045e:0x02ea) > + * and Xbox One Elite Series 2 (0x045e:0x0b00) pads to > + * initialize the controller that was previously used in > + * Bluetooth mode. > + */ > +static const u8 xboxone_s_init[] = { > + 0x05, 0x20, 0x00, 0x0f, 0x06 > +}; > + > /* > * This packet is required for the Titanfall 2 Xbox One pads > * (0x0e6f:0x0165) to finish initialization and for Hori pads > @@ -516,6 +526,8 @@ static const struct xboxone_init_packet xboxone_init_packets[] = { > XBOXONE_INIT_PKT(0x0e6f, 0x0165, xboxone_hori_init), > XBOXONE_INIT_PKT(0x0f0d, 0x0067, xboxone_hori_init), > XBOXONE_INIT_PKT(0x0000, 0x0000, xboxone_fw2015_init), > + XBOXONE_INIT_PKT(0x045e, 0x02ea, xboxone_s_init), > + XBOXONE_INIT_PKT(0x045e, 0x0b00, xboxone_s_init), > XBOXONE_INIT_PKT(0x0e6f, 0x0000, xboxone_pdp_init1), > XBOXONE_INIT_PKT(0x0e6f, 0x0000, xboxone_pdp_init2), > XBOXONE_INIT_PKT(0x24c6, 0x541a, xboxone_rumblebegin_init), >
On Wed, Apr 22, 2020 at 10:20:08AM -0700, Cameron Gutman wrote: > On 4/22/20 12:52 AM, LuK1337 wrote: > > From: Łukasz Patron <priv.luk@gmail.com> > > > > Sending [ 0x05, 0x20, 0x00, 0x0f, 0x06 ] packet for > > Xbox One S controllers fixes an issue where controller > > is stuck in Bluetooth mode and not sending any inputs. > > > > Signed-off-by: Łukasz Patron <priv.luk@gmail.com> > > Cc: stable@vger.kernel.org > > LGTM. Tested working on both of my Xbox One S gamepads: > - idVendor=045e, idProduct=02ea, bcdDevice= 3.01 > - idVendor=045e, idProduct=02ea, bcdDevice= 4.08 > > Reviewed-by: Cameron Gutman <aicommander@gmail.com> Applied, thank you. > > > --- > > drivers/input/joystick/xpad.c | 12 ++++++++++++ > > 1 file changed, 12 insertions(+) > > > > diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c > > index 6b40a1c68f9f..c77cdb3b62b5 100644 > > --- a/drivers/input/joystick/xpad.c > > +++ b/drivers/input/joystick/xpad.c > > @@ -458,6 +458,16 @@ static const u8 xboxone_fw2015_init[] = { > > 0x05, 0x20, 0x00, 0x01, 0x00 > > }; > > > > +/* > > + * This packet is required for Xbox One S (0x045e:0x02ea) > > + * and Xbox One Elite Series 2 (0x045e:0x0b00) pads to > > + * initialize the controller that was previously used in > > + * Bluetooth mode. > > + */ > > +static const u8 xboxone_s_init[] = { > > + 0x05, 0x20, 0x00, 0x0f, 0x06 > > +}; > > + > > /* > > * This packet is required for the Titanfall 2 Xbox One pads > > * (0x0e6f:0x0165) to finish initialization and for Hori pads > > @@ -516,6 +526,8 @@ static const struct xboxone_init_packet xboxone_init_packets[] = { > > XBOXONE_INIT_PKT(0x0e6f, 0x0165, xboxone_hori_init), > > XBOXONE_INIT_PKT(0x0f0d, 0x0067, xboxone_hori_init), > > XBOXONE_INIT_PKT(0x0000, 0x0000, xboxone_fw2015_init), > > + XBOXONE_INIT_PKT(0x045e, 0x02ea, xboxone_s_init), > > + XBOXONE_INIT_PKT(0x045e, 0x0b00, xboxone_s_init), > > XBOXONE_INIT_PKT(0x0e6f, 0x0000, xboxone_pdp_init1), > > XBOXONE_INIT_PKT(0x0e6f, 0x0000, xboxone_pdp_init2), > > XBOXONE_INIT_PKT(0x24c6, 0x541a, xboxone_rumblebegin_init), > > >
diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c index 6b40a1c68f9f..c77cdb3b62b5 100644 --- a/drivers/input/joystick/xpad.c +++ b/drivers/input/joystick/xpad.c @@ -458,6 +458,16 @@ static const u8 xboxone_fw2015_init[] = { 0x05, 0x20, 0x00, 0x01, 0x00 }; +/* + * This packet is required for Xbox One S (0x045e:0x02ea) + * and Xbox One Elite Series 2 (0x045e:0x0b00) pads to + * initialize the controller that was previously used in + * Bluetooth mode. + */ +static const u8 xboxone_s_init[] = { + 0x05, 0x20, 0x00, 0x0f, 0x06 +}; + /* * This packet is required for the Titanfall 2 Xbox One pads * (0x0e6f:0x0165) to finish initialization and for Hori pads @@ -516,6 +526,8 @@ static const struct xboxone_init_packet xboxone_init_packets[] = { XBOXONE_INIT_PKT(0x0e6f, 0x0165, xboxone_hori_init), XBOXONE_INIT_PKT(0x0f0d, 0x0067, xboxone_hori_init), XBOXONE_INIT_PKT(0x0000, 0x0000, xboxone_fw2015_init), + XBOXONE_INIT_PKT(0x045e, 0x02ea, xboxone_s_init), + XBOXONE_INIT_PKT(0x045e, 0x0b00, xboxone_s_init), XBOXONE_INIT_PKT(0x0e6f, 0x0000, xboxone_pdp_init1), XBOXONE_INIT_PKT(0x0e6f, 0x0000, xboxone_pdp_init2), XBOXONE_INIT_PKT(0x24c6, 0x541a, xboxone_rumblebegin_init),