lkml.org 
[lkml]   [2021]   [Feb]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 40/43] Input: xpad - sync supported devices with fork on GitHub
    Date
    From: Benjamin Valentin <benpicco@googlemail.com>

    commit 9bbd77d5bbc9aff8cb74d805c31751f5f0691ba8 upstream.

    There is a fork of this driver on GitHub [0] that has been updated
    with new device IDs.

    Merge those into the mainline driver, so the out-of-tree fork is not
    needed for users of those devices anymore.

    [0] https://github.com/paroj/xpad

    Signed-off-by: Benjamin Valentin <benpicco@googlemail.com>
    Link: https://lore.kernel.org/r/20210121142523.1b6b050f@rechenknecht2k11
    Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/input/joystick/xpad.c | 17 ++++++++++++++++-
    1 file changed, 16 insertions(+), 1 deletion(-)

    --- a/drivers/input/joystick/xpad.c
    +++ b/drivers/input/joystick/xpad.c
    @@ -232,9 +232,17 @@ static const struct xpad_device {
    { 0x0e6f, 0x0213, "Afterglow Gamepad for Xbox 360", 0, XTYPE_XBOX360 },
    { 0x0e6f, 0x021f, "Rock Candy Gamepad for Xbox 360", 0, XTYPE_XBOX360 },
    { 0x0e6f, 0x0246, "Rock Candy Gamepad for Xbox One 2015", 0, XTYPE_XBOXONE },
    - { 0x0e6f, 0x02ab, "PDP Controller for Xbox One", 0, XTYPE_XBOXONE },
    + { 0x0e6f, 0x02a0, "PDP Xbox One Controller", 0, XTYPE_XBOXONE },
    + { 0x0e6f, 0x02a1, "PDP Xbox One Controller", 0, XTYPE_XBOXONE },
    + { 0x0e6f, 0x02a2, "PDP Wired Controller for Xbox One - Crimson Red", 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, 0x02a7, "PDP Xbox One Controller", 0, XTYPE_XBOXONE },
    + { 0x0e6f, 0x02a8, "PDP Xbox One Controller", 0, XTYPE_XBOXONE },
    + { 0x0e6f, 0x02ab, "PDP Controller for Xbox One", 0, XTYPE_XBOXONE },
    + { 0x0e6f, 0x02ad, "PDP Wired Controller for Xbox One - Stealth Series", 0, XTYPE_XBOXONE },
    + { 0x0e6f, 0x02b3, "Afterglow Prismatic Wired Controller", 0, XTYPE_XBOXONE },
    + { 0x0e6f, 0x02b8, "Afterglow Prismatic Wired Controller", 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 },
    @@ -313,6 +321,9 @@ static const struct xpad_device {
    { 0x1bad, 0xfa01, "MadCatz GamePad", 0, XTYPE_XBOX360 },
    { 0x1bad, 0xfd00, "Razer Onza TE", 0, XTYPE_XBOX360 },
    { 0x1bad, 0xfd01, "Razer Onza", 0, XTYPE_XBOX360 },
    + { 0x20d6, 0x2001, "BDA Xbox Series X Wired Controller", 0, XTYPE_XBOXONE },
    + { 0x20d6, 0x281f, "PowerA Wired Controller For Xbox 360", 0, XTYPE_XBOX360 },
    + { 0x2e24, 0x0652, "Hyperkin Duke X-Box One pad", 0, XTYPE_XBOXONE },
    { 0x24c6, 0x5000, "Razer Atrox Arcade Stick", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOX360 },
    { 0x24c6, 0x5300, "PowerA MINI PROEX Controller", 0, XTYPE_XBOX360 },
    { 0x24c6, 0x5303, "Xbox Airflo wired controller", 0, XTYPE_XBOX360 },
    @@ -446,8 +457,12 @@ static const struct usb_device_id xpad_t
    XPAD_XBOX360_VENDOR(0x162e), /* Joytech X-Box 360 controllers */
    XPAD_XBOX360_VENDOR(0x1689), /* Razer Onza */
    XPAD_XBOX360_VENDOR(0x1bad), /* Harminix Rock Band Guitar and Drums */
    + XPAD_XBOX360_VENDOR(0x20d6), /* PowerA Controllers */
    + XPAD_XBOXONE_VENDOR(0x20d6), /* PowerA Controllers */
    XPAD_XBOX360_VENDOR(0x24c6), /* PowerA Controllers */
    XPAD_XBOXONE_VENDOR(0x24c6), /* PowerA Controllers */
    + XPAD_XBOXONE_VENDOR(0x2e24), /* Hyperkin Duke X-Box One pad */
    + XPAD_XBOX360_VENDOR(0x2f24), /* GameSir Controllers */
    { }
    };


    \
     
     \ /
      Last update: 2021-02-08 16:54    [W:5.830 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site