lkml.org 
[lkml]   [2018]   [Oct]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.18 126/135] Input: xpad - add support for Xbox1 PDP Camo series gamepad
    Date
    4.18-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Ramses Ramírez <ramzeto@gmail.com>

    commit 9735082a7cbae572c2eabdc45acecc8c9fa0759b upstream.

    The "Xbox One PDP Wired Controller - Camo series" has a different
    product-id than the regular PDP controller and the PDP stealth series,
    but it uses the same initialization sequence. This patch adds the
    product-id of the camo series to the structures that handle the other
    PDP Xbox One controllers.

    Signed-off-by: Ramses Ramírez <ramzeto@gmail.com>
    Cc: stable@vger.kernel.org
    Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/input/joystick/xpad.c | 3 +++
    1 file changed, 3 insertions(+)

    --- a/drivers/input/joystick/xpad.c
    +++ b/drivers/input/joystick/xpad.c
    @@ -231,6 +231,7 @@ static const struct xpad_device {
    { 0x0e6f, 0x0246, "Rock Candy Gamepad for Xbox One 2015", 0, XTYPE_XBOXONE },
    { 0x0e6f, 0x02ab, "PDP Controller for Xbox One", 0, XTYPE_XBOXONE },
    { 0x0e6f, 0x02a4, "PDP Wired Controller for Xbox One - Stealth Series", 0, XTYPE_XBOXONE },
    + { 0x0e6f, 0x02a6, "PDP Wired Controller for Xbox One - Camo Series", 0, XTYPE_XBOXONE },
    { 0x0e6f, 0x0301, "Logic3 Controller", 0, XTYPE_XBOX360 },
    { 0x0e6f, 0x0346, "Rock Candy Gamepad for Xbox One 2016", 0, XTYPE_XBOXONE },
    { 0x0e6f, 0x0401, "Logic3 Controller", 0, XTYPE_XBOX360 },
    @@ -530,6 +531,8 @@ static const struct xboxone_init_packet
    XBOXONE_INIT_PKT(0x0e6f, 0x02ab, xboxone_pdp_init2),
    XBOXONE_INIT_PKT(0x0e6f, 0x02a4, xboxone_pdp_init1),
    XBOXONE_INIT_PKT(0x0e6f, 0x02a4, xboxone_pdp_init2),
    + XBOXONE_INIT_PKT(0x0e6f, 0x02a6, xboxone_pdp_init1),
    + XBOXONE_INIT_PKT(0x0e6f, 0x02a6, xboxone_pdp_init2),
    XBOXONE_INIT_PKT(0x24c6, 0x541a, xboxone_rumblebegin_init),
    XBOXONE_INIT_PKT(0x24c6, 0x542a, xboxone_rumblebegin_init),
    XBOXONE_INIT_PKT(0x24c6, 0x543a, xboxone_rumblebegin_init),

    \
     
     \ /
      Last update: 2018-10-16 19:39    [W:4.086 / U:0.228 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site