This is an automated email from the git hooks/post-receive script. wrar-guest pushed a commit to branch master in repository xboxdrv.
commit 033269715963ef2fefba086672be0579d0d4e72f Author: Ingo Ruhnke <[email protected]> Date: Mon Nov 9 10:59:24 2015 +0100 Synced device list with xpad Fixes #160 # Conflicts: # src/xpad_device.cpp --- src/xpad_device.cpp | 41 ++++++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/src/xpad_device.cpp b/src/xpad_device.cpp index ffad05b..3047fa5 100644 --- a/src/xpad_device.cpp +++ b/src/xpad_device.cpp @@ -26,11 +26,11 @@ XPadDevice xpad_devices[] = { // { GAMEPAD_XBOX, 0xffff, 0xffff, "Chinese-made Xbox Controller" }, // These should work + { GAMEPAD_XBOX, 0x0d2f, 0x0002, "Andamiro Pump It Up pad" }, { GAMEPAD_XBOX, 0x045e, 0x0202, "Microsoft X-Box pad v1 (US)" }, { GAMEPAD_XBOX, 0x045e, 0x0285, "Microsoft X-Box pad (Japan)" }, - { GAMEPAD_XBOX, 0x045e, 0x0285, "Microsoft Xbox Controller S" }, { GAMEPAD_XBOX, 0x045e, 0x0287, "Microsoft Xbox Controller S" }, - { GAMEPAD_XBOX, 0x045e, 0x0289, "Microsoft Corp. Xbox Controller S" }, + { GAMEPAD_XBOX, 0x045e, 0x0289, "Microsoft X-Box pad v2 (US)" }, // { GAMEPAD_XBOX, 0x045e, 0x0288, "Microsoft Corp. Xbox Controller S Hub" }, memory card slot { GAMEPAD_XBOX, 0x046d, 0xca84, "Logitech Xbox Cordless Controller" }, { GAMEPAD_XBOX, 0x046d, 0xca88, "Logitech Compact Controller for Xbox" }, @@ -55,20 +55,20 @@ XPadDevice xpad_devices[] = { { GAMEPAD_XBOX, 0x102c, 0xff0c, "Joytech Wireless Advanced Controller" }, { GAMEPAD_XBOX, 0x044f, 0x0f07, "Thrustmaster, Inc. Controller" }, { GAMEPAD_XBOX, 0x0e8f, 0x3008, "Generic xbox control (dealextreme)" }, - { GAMEPAD_XBOX360, 0x045e, 0x028e, "Microsoft Xbox 360 Controller" }, + { GAMEPAD_XBOX360, 0x045e, 0x028e, "Microsoft X-Box 360 pad" }, //{ GAMEPAD_XBOX360_PLAY_N_CHARGE, 0x045e, 0x028f, "Microsoft Xbox 360 Play&Charge Kit" }, - { GAMEPAD_XBOX360, 0x0738, 0x4716, "Mad Catz Xbox 360 Controller" }, + { GAMEPAD_XBOX360, 0x0738, 0x4716, "Mad Catz Wired Xbox 360 Controller" }, { GAMEPAD_XBOX360, 0x0738, 0x4726, "Mad Catz Xbox 360 Controller" }, { GAMEPAD_XBOX360, 0x0738, 0x4728, "Mad Catz Street Fighter IV FightPad" }, { GAMEPAD_XBOX360, 0x0738, 0x4740, "Mad Catz Beat Pad" }, { GAMEPAD_XBOX360, 0x0738, 0xb726, "Mad Catz Xbox controller - MW2" }, { GAMEPAD_XBOX360, 0x0738, 0xf738, "Super SFIV FightStick TE S" }, { GAMEPAD_XBOX360, 0x0738, 0x4718, "Mad Catz Street Fighter IV FightStick SE" }, - { GAMEPAD_XBOX360, 0x0738, 0x4738, "Mad Catz Street Fighter IV FightStick TE" }, - { GAMEPAD_XBOX360, 0x0738, 0xbeef, "Mad Catz Xbox 360 Controller" }, + { GAMEPAD_XBOX360, 0x0738, 0x4738, "Mad Catz Wired Xbox 360 Controller (SFIV)" }, + { GAMEPAD_XBOX360, 0x0738, 0xbeef, "Mad Catz JOYTECH NEO SE Advanced GamePad" }, { GAMEPAD_XBOX360, 0x0f0d, 0x000a, "Hori Co. DOA4 FightStick" }, - { GAMEPAD_XBOX360, 0x0f0d, 0x000d, "Hori Fighting Stick Ex2" }, - { GAMEPAD_XBOX360, 0x0f0d, 0x0016, "Hori Real Arcade Pro Ex" }, + { GAMEPAD_XBOX360, 0x0f0d, 0x000d, "Hori Fighting Stick EX2" }, + { GAMEPAD_XBOX360, 0x0f0d, 0x0016, "Hori Real Arcade Pro.EX" }, { GAMEPAD_XBOX360, 0x056e, 0x2004, "Elecom JC-U3613M" }, { GAMEPAD_XBOX360, 0x24c6, 0x5501, "Hori Real Arcade Pro VX-SA" }, { GAMEPAD_XBOX360, 0x24c6, 0x5303, "Xbox Airflo wired controller" }, @@ -76,21 +76,24 @@ XPadDevice xpad_devices[] = { { GAMEPAD_XBOX360, 0x24c6, 0x5397, "FUS1ON Tournament Controller" }, { GAMEPAD_XBOX360, 0x24c6, 0x5503, "Hori Fighting Edge" }, { GAMEPAD_XBOX360, 0x24c6, 0x550d, "Hori GEM Xbox controller" }, + { GAMEPAD_XBOX360, 0x24c6, 0x5b03, "Thrustmaster Ferrari 458 Racing Wheel" }, { GAMEPAD_XBOX360, 0x162e, 0xbeef, "Joytech Neo-Se Take2" }, { GAMEPAD_XBOX360, 0x044f, 0xb326, "Thrustmaster Gamepad GP XID" }, - { GAMEPAD_XBOX360, 0x046d, 0xc21d, "Logitech F310" }, - { GAMEPAD_XBOX360, 0x046d, 0xc21e, "Logitech F510" }, - { GAMEPAD_XBOX360, 0x046d, 0xc21f, "Logitech F710" }, - { GAMEPAD_XBOX360, 0x046d, 0xc242, "Logitech ChillStream" }, + { GAMEPAD_XBOX360, 0x046d, 0xc21d, "Logitech Gamepad F310" }, + { GAMEPAD_XBOX360, 0x046d, 0xc21e, "Logitech Gamepad F510" }, + { GAMEPAD_XBOX360, 0x046d, 0xc21f, "Logitech Gamepad F710" }, + { GAMEPAD_XBOX360, 0x046d, 0xc242, "Logitech Chillstream Controller" }, { GAMEPAD_XBOX360, 0x0738, 0xcb03, "Saitek P3200 Rumble Pad - PC/Xbox 360" }, { GAMEPAD_XBOX360, 0x0738, 0xcb02, "Saitek Cyborg Rumble Pad - PC/Xbox 360" }, - { GAMEPAD_XBOX360, 0x0e6f, 0x0201, "Pelican TSZ360 Pad" }, + { GAMEPAD_XBOX360, 0x0e6f, 0x0201, "Pelican PL-3601 'TSZ' Wired Xbox 360 Controller" }, + { GAMEPAD_XBOX360, 0x0e6f, 0x0105, "HSM3 Xbox360 dancepad" }, { GAMEPAD_XBOX360, 0x0e6f, 0x0113, "Afterglow AX.1 Gamepad for Xbox 360" }, { GAMEPAD_XBOX360, 0x0e6f, 0x0213, "Afterglow Gamepad for Xbox 360" }, { GAMEPAD_XBOX360, 0x0e6f, 0x0401, "Logic3 Controller" }, { GAMEPAD_XBOX360, 0x0e6f, 0x0301, "Logic3 Controller" }, { GAMEPAD_XBOX360, 0x12ab, 0x0301, "PDP AFTERGLOW AX.1" }, { GAMEPAD_XBOX360_GUITAR, 0x1430, 0x4748, "RedOctane Guitar Hero X-plorer" }, + { GAMEPAD_XBOX360, 0x146b, 0x0601, "BigBen Interactive XBOX 360 Controller" }, { GAMEPAD_XBOX360_GUITAR, 0x1bad, 0x0002, "Harmonix Guitar for Xbox 360" }, { GAMEPAD_XBOX360_GUITAR, 0x1bad, 0x0003, "Harmonix Drum Kit for Xbox 360" }, { GAMEPAD_XBOX360, 0x1bad, 0xf016, "Mad Catz Xbox 360 Controller" }, @@ -107,15 +110,15 @@ XPadDevice xpad_devices[] = { { GAMEPAD_XBOX360, 0x1bad, 0xfa01, "MadCatz GamePad" }, { GAMEPAD_XBOX360, 0x15e4, 0x3f00, "Power A Mini Pro Elite" }, { GAMEPAD_XBOX360, 0x15e4, 0x3f10, "Batarang Xbox 360 controller" }, - { GAMEPAD_XBOX360_WIRELESS, 0x045e, 0x0291, "Microsoft Xbox 360 Wireless Controller" }, // RF Module from the Xbox360 - { GAMEPAD_XBOX360_WIRELESS, 0x045e, 0x0719, "Microsoft Xbox 360 Wireless Controller (PC)" }, // official Wireless Receiver + { GAMEPAD_XBOX360_WIRELESS, 0x045e, 0x0291, "Xbox 360 Wireless Receiver (XBOX)" }, // RF Module from the Xbox360 + { GAMEPAD_XBOX360_WIRELESS, 0x045e, 0x0719, "Xbox 360 Wireless Receiver" }, // official Wireless Receiver { GAMEPAD_XBOX360, 0x24c6, 0x5000, "Razer Atrox Arcade Stick" }, - { GAMEPAD_XBOX360, 0x1689, 0xfd00, "Razer Onza" }, - { GAMEPAD_XBOX360, 0x1689, 0xfd01, "Razer Onza Tournament Edition" }, + { GAMEPAD_XBOX360, 0x1689, 0xfd00, "Razer Onza Tournament Edition" }, + { GAMEPAD_XBOX360, 0x1689, 0xfd01, "Razer Onza Classic Edition" }, { GAMEPAD_XBOX360, 0x1532, 0x0037, "Razer Sabertooth" }, - { GAMEPAD_XBOX360, 0x12ab, 0x0004, "DDR Universe 2 Mat" }, + { GAMEPAD_XBOX360, 0x12ab, 0x0004, "Honey Bee Xbox360 dancepad" }, { GAMEPAD_XBOX360, 0x15e4, 0x3f0a, "Xbox Airflo wired controller" }, - { GAMEPAD_XBOX360, 0x24c6, 0x5300, "Power A Mini Pro Elite Glow" }, + { GAMEPAD_XBOX360, 0x24c6, 0x5300, "PowerA MINI PROEX Controller" }, { GAMEPAD_XBOX360, 0x24c6, 0x5500, "Hori XBOX 360 EX 2 with Turbo" }, { GAMEPAD_XBOX360, 0x24c6, 0x5506, "Hori SOULCALIBUR V Stick" }, { GAMEPAD_XBOX360, 0x24c6, 0x5b02, "Thrustmaster, Inc. GPX Controller" }, -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/xboxdrv.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
