lkml.org 
[lkml]   [2018]   [Nov]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.18 45/83] Input: xpad - add more third-party controllers
    Date
    3.18-stable review patch.  If anyone has any objections, please let me know.

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

    [ Upstream commit 6538c3b2d2d220a974e47928b165ea09b9cfa6b4 ]

    Signed-off-by: Pierre-Loup A. Griffais <eduke32@plagman.net>
    Signed-off-by: Thomas Debesse <dev@illwieckz.net>
    Signed-off-by: aronschatz <aronschatz@aselabs.com>
    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 | 9 +++++++++
    1 file changed, 9 insertions(+)

    diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
    index 43b09dbacee6..2a0573eeadaa 100644
    --- a/drivers/input/joystick/xpad.c
    +++ b/drivers/input/joystick/xpad.c
    @@ -173,9 +173,11 @@ static const struct xpad_device {
    { 0x0e6f, 0x0006, "Edge wireless Controller", 0, XTYPE_XBOX },
    { 0x0e6f, 0x0105, "HSM3 Xbox360 dancepad", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360 },
    { 0x0e6f, 0x0113, "Afterglow AX.1 Gamepad for Xbox 360", 0, XTYPE_XBOX360 },
    + { 0x0e6f, 0x0139, "Afterglow Prismatic Wired Controller", 0, XTYPE_XBOXONE },
    { 0x0e6f, 0x0201, "Pelican PL-3601 'TSZ' Wired Xbox 360 Controller", 0, XTYPE_XBOX360 },
    { 0x0e6f, 0x0213, "Afterglow Gamepad for Xbox 360", 0, XTYPE_XBOX360 },
    { 0x0e6f, 0x021f, "Rock Candy Gamepad for Xbox 360", 0, XTYPE_XBOX360 },
    + { 0x0e6f, 0x0146, "Rock Candy Wired Controller for Xbox One", 0, XTYPE_XBOXONE },
    { 0x0e6f, 0x0301, "Logic3 Controller", 0, XTYPE_XBOX360 },
    { 0x0e6f, 0x0401, "Logic3 Controller", 0, XTYPE_XBOX360 },
    { 0x0e8f, 0x0201, "SmartJoy Frag Xpad/PS2 adaptor", 0, XTYPE_XBOX },
    @@ -183,6 +185,7 @@ static const struct xpad_device {
    { 0x0f0d, 0x000a, "Hori Co. DOA4 FightStick", 0, XTYPE_XBOX360 },
    { 0x0f0d, 0x000d, "Hori Fighting Stick EX2", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOX360 },
    { 0x0f0d, 0x0016, "Hori Real Arcade Pro.EX", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOX360 },
    + { 0x0f0d, 0x0067, "HORIPAD ONE", 0, XTYPE_XBOXONE },
    { 0x0f30, 0x0202, "Joytech Advanced Controller", 0, XTYPE_XBOX },
    { 0x0f30, 0x8888, "BigBen XBMiniPad Controller", 0, XTYPE_XBOX },
    { 0x102c, 0xff0c, "Joytech Wireless Advanced Controller", 0, XTYPE_XBOX },
    @@ -200,6 +203,7 @@ static const struct xpad_device {
    { 0x162e, 0xbeef, "Joytech Neo-Se Take2", 0, XTYPE_XBOX360 },
    { 0x1689, 0xfd00, "Razer Onza Tournament Edition", 0, XTYPE_XBOX360 },
    { 0x1689, 0xfd01, "Razer Onza Classic Edition", 0, XTYPE_XBOX360 },
    + { 0x24c6, 0x542a, "Xbox ONE spectra", 0, XTYPE_XBOXONE },
    { 0x24c6, 0x5d04, "Razer Sabertooth", 0, XTYPE_XBOX360 },
    { 0x1bad, 0x0002, "Harmonix Rock Band Guitar", 0, XTYPE_XBOX360 },
    { 0x1bad, 0x0003, "Harmonix Rock Band Drumkit", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360 },
    @@ -213,6 +217,8 @@ static const struct xpad_device {
    { 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 },
    + { 0x24c6, 0x541a, "PowerA Xbox One Mini Wired Controller", 0, XTYPE_XBOXONE },
    + { 0x24c6, 0x543a, "PowerA Xbox One wired controller", 0, XTYPE_XBOXONE },
    { 0x24c6, 0x5500, "Hori XBOX 360 EX 2 with Turbo", 0, XTYPE_XBOX360 },
    { 0x24c6, 0x5501, "Hori Real Arcade Pro VX-SA", 0, XTYPE_XBOX360 },
    { 0x24c6, 0x5506, "Hori SOULCALIBUR V Stick", 0, XTYPE_XBOX360 },
    @@ -308,13 +314,16 @@ static struct usb_device_id xpad_table[] = {
    { USB_DEVICE(0x0738, 0x4540) }, /* Mad Catz Beat Pad */
    XPAD_XBOXONE_VENDOR(0x0738), /* Mad Catz FightStick TE 2 */
    XPAD_XBOX360_VENDOR(0x0e6f), /* 0x0e6f X-Box 360 controllers */
    + XPAD_XBOXONE_VENDOR(0x0e6f), /* 0x0e6f X-Box One controllers */
    XPAD_XBOX360_VENDOR(0x12ab), /* X-Box 360 dance pads */
    XPAD_XBOX360_VENDOR(0x1430), /* RedOctane X-Box 360 controllers */
    XPAD_XBOX360_VENDOR(0x146b), /* BigBen Interactive Controllers */
    XPAD_XBOX360_VENDOR(0x1bad), /* Harminix Rock Band Guitar and Drums */
    XPAD_XBOX360_VENDOR(0x0f0d), /* Hori Controllers */
    + XPAD_XBOXONE_VENDOR(0x0f0d), /* Hori Controllers */
    XPAD_XBOX360_VENDOR(0x1689), /* Razer Onza */
    XPAD_XBOX360_VENDOR(0x24c6), /* PowerA Controllers */
    + XPAD_XBOXONE_VENDOR(0x24c6), /* PowerA Controllers */
    XPAD_XBOX360_VENDOR(0x1532), /* Razer Sabertooth */
    XPAD_XBOXONE_VENDOR(0x1532), /* Razer Wildcat */
    XPAD_XBOX360_VENDOR(0x15e4), /* Numark X-Box 360 controllers */
    --
    2.17.1


    \
     
     \ /
      Last update: 2018-11-29 16:06    [W:6.120 / U:0.088 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site