Use a unified name list for Xbox 360 and Xbox One controllers for drivers that can handle both
Sam Lantinga
parent
aad340eb86
commit
3f5ff751fe
|
|
@ -36,132 +36,6 @@
|
|||
|
||||
#define USB_PACKET_LENGTH 64
|
||||
|
||||
typedef struct
|
||||
{
|
||||
Uint16 vendor_id;
|
||||
Uint16 product_id;
|
||||
const char *name;
|
||||
} SDL_DriverXbox360_DeviceName;
|
||||
|
||||
static const SDL_DriverXbox360_DeviceName xbox360_devicenames[] = {
|
||||
{ 0x0079, 0x18d4, "GPD Win 2 X-Box Controller" },
|
||||
{ 0x044f, 0xb326, "Thrustmaster Gamepad GP XID" },
|
||||
{ 0x045e, 0x028e, "Microsoft X-Box 360 pad" },
|
||||
{ 0x045e, 0x028f, "Microsoft X-Box 360 pad v2" },
|
||||
{ 0x045e, 0x0291, "Xbox 360 Wireless Receiver (XBOX)" },
|
||||
{ 0x045e, 0x0719, "Xbox 360 Wireless Receiver" },
|
||||
{ 0x046d, 0xc21d, "Logitech Gamepad F310" },
|
||||
{ 0x046d, 0xc21e, "Logitech Gamepad F510" },
|
||||
{ 0x046d, 0xc21f, "Logitech Gamepad F710" },
|
||||
{ 0x046d, 0xc242, "Logitech Chillstream Controller" },
|
||||
{ 0x046d, 0xcaa3, "Logitech DriveFx Racing Wheel" },
|
||||
{ 0x056e, 0x2004, "Elecom JC-U3613M" },
|
||||
{ 0x06a3, 0xf51a, "Saitek P3600" },
|
||||
{ 0x0738, 0x4716, "Mad Catz Wired Xbox 360 Controller" },
|
||||
{ 0x0738, 0x4718, "Mad Catz Street Fighter IV FightStick SE" },
|
||||
{ 0x0738, 0x4726, "Mad Catz Xbox 360 Controller" },
|
||||
{ 0x0738, 0x4728, "Mad Catz Street Fighter IV FightPad" },
|
||||
{ 0x0738, 0x4736, "Mad Catz MicroCon Gamepad" },
|
||||
{ 0x0738, 0x4738, "Mad Catz Wired Xbox 360 Controller (SFIV)" },
|
||||
{ 0x0738, 0x4740, "Mad Catz Beat Pad" },
|
||||
{ 0x0738, 0x4758, "Mad Catz Arcade Game Stick" },
|
||||
{ 0x0738, 0x9871, "Mad Catz Portable Drum" },
|
||||
{ 0x0738, 0xb726, "Mad Catz Xbox controller - MW2" },
|
||||
{ 0x0738, 0xb738, "Mad Catz MVC2TE Stick 2" },
|
||||
{ 0x0738, 0xbeef, "Mad Catz JOYTECH NEO SE Advanced GamePad" },
|
||||
{ 0x0738, 0xcb02, "Saitek Cyborg Rumble Pad - PC/Xbox 360" },
|
||||
{ 0x0738, 0xcb03, "Saitek P3200 Rumble Pad - PC/Xbox 360" },
|
||||
{ 0x0738, 0xcb29, "Saitek Aviator Stick AV8R02" },
|
||||
{ 0x0738, 0xf738, "Super SFIV FightStick TE S" },
|
||||
{ 0x07ff, 0xffff, "Mad Catz GamePad" },
|
||||
{ 0x0e6f, 0x0105, "HSM3 Xbox360 dancepad" },
|
||||
{ 0x0e6f, 0x0113, "Afterglow AX.1 Gamepad for Xbox 360" },
|
||||
{ 0x0e6f, 0x011f, "Rock Candy Gamepad Wired Controller" },
|
||||
{ 0x0e6f, 0x0131, "PDP EA Sports Controller" },
|
||||
{ 0x0e6f, 0x0133, "Xbox 360 Wired Controller" },
|
||||
{ 0x0e6f, 0x0201, "Pelican PL-3601 'TSZ' Wired Xbox 360 Controller" },
|
||||
{ 0x0e6f, 0x0213, "Afterglow Gamepad for Xbox 360" },
|
||||
{ 0x0e6f, 0x021f, "Rock Candy Gamepad for Xbox 360" },
|
||||
{ 0x0e6f, 0x0301, "Logic3 Controller" },
|
||||
{ 0x0e6f, 0x0401, "Logic3 Controller" },
|
||||
{ 0x0e6f, 0x0413, "Afterglow AX.1 Gamepad for Xbox 360" },
|
||||
{ 0x0e6f, 0x0501, "PDP Xbox 360 Controller" },
|
||||
{ 0x0e6f, 0xf900, "PDP Afterglow AX.1" },
|
||||
{ 0x0f0d, 0x000a, "Hori Co. DOA4 FightStick" },
|
||||
{ 0x0f0d, 0x000c, "Hori PadEX Turbo" },
|
||||
{ 0x0f0d, 0x000d, "Hori Fighting Stick EX2" },
|
||||
{ 0x0f0d, 0x0016, "Hori Real Arcade Pro.EX" },
|
||||
{ 0x0f0d, 0x001b, "Hori Real Arcade Pro VX" },
|
||||
{ 0x11c9, 0x55f0, "Nacon GC-100XF" },
|
||||
{ 0x12ab, 0x0004, "Honey Bee Xbox360 dancepad" },
|
||||
{ 0x12ab, 0x0301, "PDP AFTERGLOW AX.1" },
|
||||
{ 0x12ab, 0x0303, "Mortal Kombat Klassic FightStick" },
|
||||
{ 0x1430, 0x4748, "RedOctane Guitar Hero X-plorer" },
|
||||
{ 0x1430, 0xf801, "RedOctane Controller" },
|
||||
{ 0x146b, 0x0601, "BigBen Interactive XBOX 360 Controller" },
|
||||
{ 0x1532, 0x0037, "Razer Sabertooth" },
|
||||
{ 0x15e4, 0x3f00, "Power A Mini Pro Elite" },
|
||||
{ 0x15e4, 0x3f0a, "Xbox Airflo wired controller" },
|
||||
{ 0x15e4, 0x3f10, "Batarang Xbox 360 controller" },
|
||||
{ 0x162e, 0xbeef, "Joytech Neo-Se Take2" },
|
||||
{ 0x1689, 0xfd00, "Razer Onza Tournament Edition" },
|
||||
{ 0x1689, 0xfd01, "Razer Onza Classic Edition" },
|
||||
{ 0x1689, 0xfe00, "Razer Sabertooth" },
|
||||
{ 0x1bad, 0x0002, "Harmonix Rock Band Guitar" },
|
||||
{ 0x1bad, 0x0003, "Harmonix Rock Band Drumkit" },
|
||||
{ 0x1bad, 0x0130, "Ion Drum Rocker" },
|
||||
{ 0x1bad, 0xf016, "Mad Catz Xbox 360 Controller" },
|
||||
{ 0x1bad, 0xf018, "Mad Catz Street Fighter IV SE Fighting Stick" },
|
||||
{ 0x1bad, 0xf019, "Mad Catz Brawlstick for Xbox 360" },
|
||||
{ 0x1bad, 0xf021, "Mad Cats Ghost Recon FS GamePad" },
|
||||
{ 0x1bad, 0xf023, "MLG Pro Circuit Controller (Xbox)" },
|
||||
{ 0x1bad, 0xf025, "Mad Catz Call Of Duty" },
|
||||
{ 0x1bad, 0xf027, "Mad Catz FPS Pro" },
|
||||
{ 0x1bad, 0xf028, "Street Fighter IV FightPad" },
|
||||
{ 0x1bad, 0xf02e, "Mad Catz Fightpad" },
|
||||
{ 0x1bad, 0xf030, "Mad Catz Xbox 360 MC2 MicroCon Racing Wheel" },
|
||||
{ 0x1bad, 0xf036, "Mad Catz MicroCon GamePad Pro" },
|
||||
{ 0x1bad, 0xf038, "Street Fighter IV FightStick TE" },
|
||||
{ 0x1bad, 0xf039, "Mad Catz MvC2 TE" },
|
||||
{ 0x1bad, 0xf03a, "Mad Catz SFxT Fightstick Pro" },
|
||||
{ 0x1bad, 0xf03d, "Street Fighter IV Arcade Stick TE - Chun Li" },
|
||||
{ 0x1bad, 0xf03e, "Mad Catz MLG FightStick TE" },
|
||||
{ 0x1bad, 0xf03f, "Mad Catz FightStick SoulCaliber" },
|
||||
{ 0x1bad, 0xf042, "Mad Catz FightStick TES+" },
|
||||
{ 0x1bad, 0xf080, "Mad Catz FightStick TE2" },
|
||||
{ 0x1bad, 0xf501, "HoriPad EX2 Turbo" },
|
||||
{ 0x1bad, 0xf502, "Hori Real Arcade Pro.VX SA" },
|
||||
{ 0x1bad, 0xf503, "Hori Fighting Stick VX" },
|
||||
{ 0x1bad, 0xf504, "Hori Real Arcade Pro. EX" },
|
||||
{ 0x1bad, 0xf505, "Hori Fighting Stick EX2B" },
|
||||
{ 0x1bad, 0xf506, "Hori Real Arcade Pro.EX Premium VLX" },
|
||||
{ 0x1bad, 0xf900, "Harmonix Xbox 360 Controller" },
|
||||
{ 0x1bad, 0xf901, "Gamestop Xbox 360 Controller" },
|
||||
{ 0x1bad, 0xf903, "Tron Xbox 360 controller" },
|
||||
{ 0x1bad, 0xf904, "PDP Versus Fighting Pad" },
|
||||
{ 0x1bad, 0xf906, "MortalKombat FightStick" },
|
||||
{ 0x1bad, 0xfa01, "MadCatz GamePad" },
|
||||
{ 0x1bad, 0xfd00, "Razer Onza TE" },
|
||||
{ 0x1bad, 0xfd01, "Razer Onza" },
|
||||
{ 0x24c6, 0x5000, "Razer Atrox Arcade Stick" },
|
||||
{ 0x24c6, 0x5300, "PowerA MINI PROEX Controller" },
|
||||
{ 0x24c6, 0x5303, "Xbox Airflo wired controller" },
|
||||
{ 0x24c6, 0x530a, "Xbox 360 Pro EX Controller" },
|
||||
{ 0x24c6, 0x531a, "PowerA Pro Ex" },
|
||||
{ 0x24c6, 0x5397, "FUS1ON Tournament Controller" },
|
||||
{ 0x24c6, 0x5500, "Hori XBOX 360 EX 2 with Turbo" },
|
||||
{ 0x24c6, 0x5501, "Hori Real Arcade Pro VX-SA" },
|
||||
{ 0x24c6, 0x5502, "Hori Fighting Stick VX Alt" },
|
||||
{ 0x24c6, 0x5503, "Hori Fighting Edge" },
|
||||
{ 0x24c6, 0x5506, "Hori SOULCALIBUR V Stick" },
|
||||
{ 0x24c6, 0x550d, "Hori GEM Xbox controller" },
|
||||
{ 0x24c6, 0x550e, "Hori Real Arcade Pro V Kai 360" },
|
||||
{ 0x24c6, 0x5b00, "ThrustMaster Ferrari 458 Racing Wheel" },
|
||||
{ 0x24c6, 0x5b02, "Thrustmaster, Inc. GPX Controller" },
|
||||
{ 0x24c6, 0x5b03, "Thrustmaster Ferrari 458 Racing Wheel" },
|
||||
{ 0x24c6, 0x5d04, "Razer Sabertooth" },
|
||||
{ 0x24c6, 0xfafe, "Rock Candy Gamepad for Xbox 360" },
|
||||
};
|
||||
|
||||
typedef struct {
|
||||
Uint8 last_state[USB_PACKET_LENGTH];
|
||||
|
|
@ -172,7 +46,7 @@ typedef struct {
|
|||
static SDL_bool
|
||||
HIDAPI_DriverXbox360_IsSupportedDevice(Uint16 vendor_id, Uint16 product_id, Uint16 version, int interface_number, Uint16 usage_page, Uint16 usage)
|
||||
{
|
||||
#ifdef __MACOSX__
|
||||
#if defined(__MACOSX__) || defined(__WIN32__)
|
||||
if (vendor_id == 0x045e && product_id == 0x028e && version == 1) {
|
||||
/* This is the Steam Virtual Gamepad, which isn't supported by this driver */
|
||||
return SDL_FALSE;
|
||||
|
|
@ -186,15 +60,7 @@ HIDAPI_DriverXbox360_IsSupportedDevice(Uint16 vendor_id, Uint16 product_id, Uint
|
|||
static const char *
|
||||
HIDAPI_DriverXbox360_GetDeviceName(Uint16 vendor_id, Uint16 product_id)
|
||||
{
|
||||
int i;
|
||||
|
||||
for (i = 0; i < SDL_arraysize(xbox360_devicenames); ++i) {
|
||||
const SDL_DriverXbox360_DeviceName *entry = &xbox360_devicenames[i];
|
||||
if (vendor_id == entry->vendor_id && product_id == entry->product_id) {
|
||||
return entry->name;
|
||||
}
|
||||
}
|
||||
return NULL;
|
||||
return HIDAPI_XboxControllerName(vendor_id, product_id);
|
||||
}
|
||||
|
||||
static SDL_bool SetSlotLED(hid_device *dev, Uint8 slot)
|
||||
|
|
@ -261,13 +127,13 @@ HIDAPI_DriverXbox360_Rumble(SDL_Joystick *joystick, hid_device *dev, void *conte
|
|||
return 0;
|
||||
}
|
||||
|
||||
#if 0
|
||||
#ifdef __WIN32__
|
||||
/* This is the packet format for Xbox 360 and Xbox One controllers on Windows,
|
||||
however with this interface there is no rumble support, no guide button,
|
||||
and the left and right triggers are tied together as a single axis.
|
||||
*/
|
||||
static void
|
||||
HIDAPI_DriverXboxOne_HandleStatePacket(SDL_Joystick *joystick, hid_device *dev, SDL_DriverXbox360_Context *ctx, Uint8 *data, int size )
|
||||
HIDAPI_DriverXbox360_HandleStatePacket(SDL_Joystick *joystick, hid_device *dev, SDL_DriverXbox360_Context *ctx, Uint8 *data, int size)
|
||||
{
|
||||
Sint16 axis;
|
||||
|
||||
|
|
@ -352,7 +218,7 @@ HIDAPI_DriverXboxOne_HandleStatePacket(SDL_Joystick *joystick, hid_device *dev,
|
|||
|
||||
SDL_memcpy(ctx->last_state, data, SDL_min(size, sizeof(ctx->last_state)));
|
||||
}
|
||||
#endif /* 0 */
|
||||
#else
|
||||
|
||||
static void
|
||||
HIDAPI_DriverXbox360_HandleStatePacket(SDL_Joystick *joystick, hid_device *dev, SDL_DriverXbox360_Context *ctx, Uint8 *data, int size)
|
||||
|
|
@ -406,6 +272,7 @@ HIDAPI_DriverXbox360_HandleStatePacket(SDL_Joystick *joystick, hid_device *dev,
|
|||
|
||||
SDL_memcpy(ctx->last_state, data, SDL_min(size, sizeof(ctx->last_state)));
|
||||
}
|
||||
#endif /* __WIN32__ */
|
||||
|
||||
static SDL_bool
|
||||
HIDAPI_DriverXbox360_Update(SDL_Joystick *joystick, hid_device *dev, void *context)
|
||||
|
|
@ -415,6 +282,9 @@ HIDAPI_DriverXbox360_Update(SDL_Joystick *joystick, hid_device *dev, void *conte
|
|||
int size;
|
||||
|
||||
while ((size = hid_read_timeout(dev, data, sizeof(data), 0)) > 0) {
|
||||
#ifdef __WIN32__
|
||||
HIDAPI_DriverXbox360_HandleStatePacket(joystick, dev, ctx, data, size);
|
||||
#else
|
||||
switch (data[0]) {
|
||||
case 0x00:
|
||||
HIDAPI_DriverXbox360_HandleStatePacket(joystick, dev, ctx, data, size);
|
||||
|
|
@ -425,6 +295,7 @@ HIDAPI_DriverXbox360_Update(SDL_Joystick *joystick, hid_device *dev, void *conte
|
|||
#endif
|
||||
break;
|
||||
}
|
||||
#endif /* __WIN32__ */
|
||||
}
|
||||
|
||||
if (ctx->rumble_expiration) {
|
||||
|
|
|
|||
|
|
@ -36,46 +36,6 @@
|
|||
|
||||
#define USB_PACKET_LENGTH 64
|
||||
|
||||
typedef struct
|
||||
{
|
||||
Uint16 vendor_id;
|
||||
Uint16 product_id;
|
||||
const char *name;
|
||||
} SDL_DriverXboxOne_DeviceName;
|
||||
|
||||
static const SDL_DriverXboxOne_DeviceName xboxone_devicenames[] = {
|
||||
{ 0x045e, 0x02d1, "Microsoft X-Box One pad" },
|
||||
{ 0x045e, 0x02dd, "Microsoft X-Box One pad (Firmware 2015)" },
|
||||
{ 0x045e, 0x02e3, "Microsoft X-Box One Elite pad" },
|
||||
{ 0x045e, 0x02ea, "Microsoft X-Box One S pad" },
|
||||
{ 0x045e, 0x02ff, "Microsoft X-Box One pad" },
|
||||
{ 0x0738, 0x4a01, "Mad Catz FightStick TE 2" },
|
||||
{ 0x0e6f, 0x0139, "Afterglow Prismatic Wired Controller" },
|
||||
{ 0x0e6f, 0x013a, "PDP Xbox One Controller" },
|
||||
{ 0x0e6f, 0x0146, "Rock Candy Wired Controller for Xbox One" },
|
||||
{ 0x0e6f, 0x0147, "PDP Marvel Xbox One Controller" },
|
||||
{ 0x0e6f, 0x015c, "PDP Xbox One Arcade Stick" },
|
||||
{ 0x0e6f, 0x0161, "PDP Xbox One Controller" },
|
||||
{ 0x0e6f, 0x0162, "PDP Xbox One Controller" },
|
||||
{ 0x0e6f, 0x0163, "PDP Xbox One Controller" },
|
||||
{ 0x0e6f, 0x0164, "PDP Battlefield One" },
|
||||
{ 0x0e6f, 0x0165, "PDP Titanfall 2" },
|
||||
{ 0x0e6f, 0x0246, "Rock Candy Gamepad for Xbox One 2015" },
|
||||
{ 0x0e6f, 0x02ab, "PDP Controller for Xbox One" },
|
||||
{ 0x0e6f, 0x02a4, "PDP Wired Controller for Xbox One - Stealth Series" },
|
||||
{ 0x0e6f, 0x0346, "Rock Candy Gamepad for Xbox One 2016" },
|
||||
{ 0x0f0d, 0x0063, "Hori Real Arcade Pro Hayabusa (USA) Xbox One" },
|
||||
{ 0x0f0d, 0x0067, "HORIPAD ONE" },
|
||||
{ 0x0f0d, 0x0078, "Hori Real Arcade Pro V Kai Xbox One" },
|
||||
{ 0x1532, 0x0a00, "Razer Atrox Arcade Stick" },
|
||||
{ 0x1532, 0x0a03, "Razer Wildcat" },
|
||||
{ 0x24c6, 0x541a, "PowerA Xbox One Mini Wired Controller" },
|
||||
{ 0x24c6, 0x542a, "Xbox ONE spectra" },
|
||||
{ 0x24c6, 0x543a, "PowerA Xbox One wired controller" },
|
||||
{ 0x24c6, 0x551a, "PowerA FUSION Pro Controller" },
|
||||
{ 0x24c6, 0x561a, "PowerA FUSION Controller" },
|
||||
};
|
||||
|
||||
/*
|
||||
* This packet is required for all Xbox One pads with 2015
|
||||
* or later firmware installed (or present from the factory).
|
||||
|
|
@ -179,15 +139,7 @@ HIDAPI_DriverXboxOne_IsSupportedDevice(Uint16 vendor_id, Uint16 product_id, Uint
|
|||
static const char *
|
||||
HIDAPI_DriverXboxOne_GetDeviceName(Uint16 vendor_id, Uint16 product_id)
|
||||
{
|
||||
int i;
|
||||
|
||||
for (i = 0; i < SDL_arraysize(xboxone_devicenames); ++i) {
|
||||
const SDL_DriverXboxOne_DeviceName *entry = &xboxone_devicenames[i];
|
||||
if (vendor_id == entry->vendor_id && product_id == entry->product_id) {
|
||||
return entry->name;
|
||||
}
|
||||
}
|
||||
return NULL;
|
||||
return HIDAPI_XboxControllerName(vendor_id, product_id);
|
||||
}
|
||||
|
||||
static SDL_bool
|
||||
|
|
|
|||
|
|
@ -378,6 +378,173 @@ HIDAPI_ShutdownDiscovery()
|
|||
}
|
||||
|
||||
|
||||
const char *
|
||||
HIDAPI_XboxControllerName(Uint16 vendor_id, Uint16 product_id)
|
||||
{
|
||||
static struct
|
||||
{
|
||||
Uint32 vidpid;
|
||||
const char *name;
|
||||
} names[] = {
|
||||
{ MAKE_VIDPID(0x0079, 0x18d4), "GPD Win 2 X-Box Controller" },
|
||||
{ MAKE_VIDPID(0x044f, 0xb326), "Thrustmaster Gamepad GP XID" },
|
||||
{ MAKE_VIDPID(0x045e, 0x028e), "Microsoft X-Box 360 pad" },
|
||||
{ MAKE_VIDPID(0x045e, 0x028f), "Microsoft X-Box 360 pad v2" },
|
||||
{ MAKE_VIDPID(0x045e, 0x0291), "Xbox 360 Wireless Receiver (XBOX)" },
|
||||
{ MAKE_VIDPID(0x045e, 0x02d1), "Microsoft X-Box One pad" },
|
||||
{ MAKE_VIDPID(0x045e, 0x02dd), "Microsoft X-Box One pad (Firmware 2015)" },
|
||||
{ MAKE_VIDPID(0x045e, 0x02e3), "Microsoft X-Box One Elite pad" },
|
||||
{ MAKE_VIDPID(0x045e, 0x02ea), "Microsoft X-Box One S pad" },
|
||||
{ MAKE_VIDPID(0x045e, 0x02ff), "Microsoft X-Box One pad" },
|
||||
{ MAKE_VIDPID(0x045e, 0x0719), "Xbox 360 Wireless Receiver" },
|
||||
{ MAKE_VIDPID(0x046d, 0xc21d), "Logitech Gamepad F310" },
|
||||
{ MAKE_VIDPID(0x046d, 0xc21e), "Logitech Gamepad F510" },
|
||||
{ MAKE_VIDPID(0x046d, 0xc21f), "Logitech Gamepad F710" },
|
||||
{ MAKE_VIDPID(0x046d, 0xc242), "Logitech Chillstream Controller" },
|
||||
{ MAKE_VIDPID(0x046d, 0xcaa3), "Logitech DriveFx Racing Wheel" },
|
||||
{ MAKE_VIDPID(0x056e, 0x2004), "Elecom JC-U3613M" },
|
||||
{ MAKE_VIDPID(0x06a3, 0xf51a), "Saitek P3600" },
|
||||
{ MAKE_VIDPID(0x0738, 0x4716), "Mad Catz Wired Xbox 360 Controller" },
|
||||
{ MAKE_VIDPID(0x0738, 0x4718), "Mad Catz Street Fighter IV FightStick SE" },
|
||||
{ MAKE_VIDPID(0x0738, 0x4726), "Mad Catz Xbox 360 Controller" },
|
||||
{ MAKE_VIDPID(0x0738, 0x4728), "Mad Catz Street Fighter IV FightPad" },
|
||||
{ MAKE_VIDPID(0x0738, 0x4736), "Mad Catz MicroCon Gamepad" },
|
||||
{ MAKE_VIDPID(0x0738, 0x4738), "Mad Catz Wired Xbox 360 Controller (SFIV)" },
|
||||
{ MAKE_VIDPID(0x0738, 0x4740), "Mad Catz Beat Pad" },
|
||||
{ MAKE_VIDPID(0x0738, 0x4758), "Mad Catz Arcade Game Stick" },
|
||||
{ MAKE_VIDPID(0x0738, 0x4a01), "Mad Catz FightStick TE 2" },
|
||||
{ MAKE_VIDPID(0x0738, 0x9871), "Mad Catz Portable Drum" },
|
||||
{ MAKE_VIDPID(0x0738, 0xb726), "Mad Catz Xbox controller - MW2" },
|
||||
{ MAKE_VIDPID(0x0738, 0xb738), "Mad Catz MVC2TE Stick 2" },
|
||||
{ MAKE_VIDPID(0x0738, 0xbeef), "Mad Catz JOYTECH NEO SE Advanced GamePad" },
|
||||
{ MAKE_VIDPID(0x0738, 0xcb02), "Saitek Cyborg Rumble Pad - PC/Xbox 360" },
|
||||
{ MAKE_VIDPID(0x0738, 0xcb03), "Saitek P3200 Rumble Pad - PC/Xbox 360" },
|
||||
{ MAKE_VIDPID(0x0738, 0xcb29), "Saitek Aviator Stick AV8R02" },
|
||||
{ MAKE_VIDPID(0x0738, 0xf738), "Super SFIV FightStick TE S" },
|
||||
{ MAKE_VIDPID(0x07ff, 0xffff), "Mad Catz GamePad" },
|
||||
{ MAKE_VIDPID(0x0e6f, 0x0105), "HSM3 Xbox360 dancepad" },
|
||||
{ MAKE_VIDPID(0x0e6f, 0x0113), "Afterglow AX.1 Gamepad for Xbox 360" },
|
||||
{ MAKE_VIDPID(0x0e6f, 0x011f), "Rock Candy Gamepad Wired Controller" },
|
||||
{ MAKE_VIDPID(0x0e6f, 0x0131), "PDP EA Sports Controller" },
|
||||
{ MAKE_VIDPID(0x0e6f, 0x0133), "Xbox 360 Wired Controller" },
|
||||
{ MAKE_VIDPID(0x0e6f, 0x0139), "Afterglow Prismatic Wired Controller" },
|
||||
{ MAKE_VIDPID(0x0e6f, 0x013a), "PDP Xbox One Controller" },
|
||||
{ MAKE_VIDPID(0x0e6f, 0x0146), "Rock Candy Wired Controller for Xbox One" },
|
||||
{ MAKE_VIDPID(0x0e6f, 0x0147), "PDP Marvel Xbox One Controller" },
|
||||
{ MAKE_VIDPID(0x0e6f, 0x015c), "PDP Xbox One Arcade Stick" },
|
||||
{ MAKE_VIDPID(0x0e6f, 0x0161), "PDP Xbox One Controller" },
|
||||
{ MAKE_VIDPID(0x0e6f, 0x0162), "PDP Xbox One Controller" },
|
||||
{ MAKE_VIDPID(0x0e6f, 0x0163), "PDP Xbox One Controller" },
|
||||
{ MAKE_VIDPID(0x0e6f, 0x0164), "PDP Battlefield One" },
|
||||
{ MAKE_VIDPID(0x0e6f, 0x0165), "PDP Titanfall 2" },
|
||||
{ MAKE_VIDPID(0x0e6f, 0x0201), "Pelican PL-3601 'TSZ' Wired Xbox 360 Controller" },
|
||||
{ MAKE_VIDPID(0x0e6f, 0x0213), "Afterglow Gamepad for Xbox 360" },
|
||||
{ MAKE_VIDPID(0x0e6f, 0x021f), "Rock Candy Gamepad for Xbox 360" },
|
||||
{ MAKE_VIDPID(0x0e6f, 0x0246), "Rock Candy Gamepad for Xbox One 2015" },
|
||||
{ MAKE_VIDPID(0x0e6f, 0x02a4), "PDP Wired Controller for Xbox One - Stealth Series" },
|
||||
{ MAKE_VIDPID(0x0e6f, 0x02ab), "PDP Controller for Xbox One" },
|
||||
{ MAKE_VIDPID(0x0e6f, 0x0301), "Logic3 Controller" },
|
||||
{ MAKE_VIDPID(0x0e6f, 0x0346), "Rock Candy Gamepad for Xbox One 2016" },
|
||||
{ MAKE_VIDPID(0x0e6f, 0x0401), "Logic3 Controller" },
|
||||
{ MAKE_VIDPID(0x0e6f, 0x0413), "Afterglow AX.1 Gamepad for Xbox 360" },
|
||||
{ MAKE_VIDPID(0x0e6f, 0x0501), "PDP Xbox 360 Controller" },
|
||||
{ MAKE_VIDPID(0x0e6f, 0xf900), "PDP Afterglow AX.1" },
|
||||
{ MAKE_VIDPID(0x0f0d, 0x000a), "Hori Co. DOA4 FightStick" },
|
||||
{ MAKE_VIDPID(0x0f0d, 0x000c), "Hori PadEX Turbo" },
|
||||
{ MAKE_VIDPID(0x0f0d, 0x000d), "Hori Fighting Stick EX2" },
|
||||
{ MAKE_VIDPID(0x0f0d, 0x0016), "Hori Real Arcade Pro.EX" },
|
||||
{ MAKE_VIDPID(0x0f0d, 0x001b), "Hori Real Arcade Pro VX" },
|
||||
{ MAKE_VIDPID(0x0f0d, 0x0063), "Hori Real Arcade Pro Hayabusa (USA) Xbox One" },
|
||||
{ MAKE_VIDPID(0x0f0d, 0x0067), "HORIPAD ONE" },
|
||||
{ MAKE_VIDPID(0x0f0d, 0x0078), "Hori Real Arcade Pro V Kai Xbox One" },
|
||||
{ MAKE_VIDPID(0x11c9, 0x55f0), "Nacon GC-100XF" },
|
||||
{ MAKE_VIDPID(0x12ab, 0x0004), "Honey Bee Xbox360 dancepad" },
|
||||
{ MAKE_VIDPID(0x12ab, 0x0301), "PDP AFTERGLOW AX.1" },
|
||||
{ MAKE_VIDPID(0x12ab, 0x0303), "Mortal Kombat Klassic FightStick" },
|
||||
{ MAKE_VIDPID(0x1430, 0x4748), "RedOctane Guitar Hero X-plorer" },
|
||||
{ MAKE_VIDPID(0x1430, 0xf801), "RedOctane Controller" },
|
||||
{ MAKE_VIDPID(0x146b, 0x0601), "BigBen Interactive XBOX 360 Controller" },
|
||||
{ MAKE_VIDPID(0x1532, 0x0037), "Razer Sabertooth" },
|
||||
{ MAKE_VIDPID(0x1532, 0x0a00), "Razer Atrox Arcade Stick" },
|
||||
{ MAKE_VIDPID(0x1532, 0x0a03), "Razer Wildcat" },
|
||||
{ MAKE_VIDPID(0x15e4, 0x3f00), "Power A Mini Pro Elite" },
|
||||
{ MAKE_VIDPID(0x15e4, 0x3f0a), "Xbox Airflo wired controller" },
|
||||
{ MAKE_VIDPID(0x15e4, 0x3f10), "Batarang Xbox 360 controller" },
|
||||
{ MAKE_VIDPID(0x162e, 0xbeef), "Joytech Neo-Se Take2" },
|
||||
{ MAKE_VIDPID(0x1689, 0xfd00), "Razer Onza Tournament Edition" },
|
||||
{ MAKE_VIDPID(0x1689, 0xfd01), "Razer Onza Classic Edition" },
|
||||
{ MAKE_VIDPID(0x1689, 0xfe00), "Razer Sabertooth" },
|
||||
{ MAKE_VIDPID(0x1bad, 0x0002), "Harmonix Rock Band Guitar" },
|
||||
{ MAKE_VIDPID(0x1bad, 0x0003), "Harmonix Rock Band Drumkit" },
|
||||
{ MAKE_VIDPID(0x1bad, 0x0130), "Ion Drum Rocker" },
|
||||
{ MAKE_VIDPID(0x1bad, 0xf016), "Mad Catz Xbox 360 Controller" },
|
||||
{ MAKE_VIDPID(0x1bad, 0xf018), "Mad Catz Street Fighter IV SE Fighting Stick" },
|
||||
{ MAKE_VIDPID(0x1bad, 0xf019), "Mad Catz Brawlstick for Xbox 360" },
|
||||
{ MAKE_VIDPID(0x1bad, 0xf021), "Mad Cats Ghost Recon FS GamePad" },
|
||||
{ MAKE_VIDPID(0x1bad, 0xf023), "MLG Pro Circuit Controller (Xbox)" },
|
||||
{ MAKE_VIDPID(0x1bad, 0xf025), "Mad Catz Call Of Duty" },
|
||||
{ MAKE_VIDPID(0x1bad, 0xf027), "Mad Catz FPS Pro" },
|
||||
{ MAKE_VIDPID(0x1bad, 0xf028), "Street Fighter IV FightPad" },
|
||||
{ MAKE_VIDPID(0x1bad, 0xf02e), "Mad Catz Fightpad" },
|
||||
{ MAKE_VIDPID(0x1bad, 0xf030), "Mad Catz Xbox 360 MC2 MicroCon Racing Wheel" },
|
||||
{ MAKE_VIDPID(0x1bad, 0xf036), "Mad Catz MicroCon GamePad Pro" },
|
||||
{ MAKE_VIDPID(0x1bad, 0xf038), "Street Fighter IV FightStick TE" },
|
||||
{ MAKE_VIDPID(0x1bad, 0xf039), "Mad Catz MvC2 TE" },
|
||||
{ MAKE_VIDPID(0x1bad, 0xf03a), "Mad Catz SFxT Fightstick Pro" },
|
||||
{ MAKE_VIDPID(0x1bad, 0xf03d), "Street Fighter IV Arcade Stick TE - Chun Li" },
|
||||
{ MAKE_VIDPID(0x1bad, 0xf03e), "Mad Catz MLG FightStick TE" },
|
||||
{ MAKE_VIDPID(0x1bad, 0xf03f), "Mad Catz FightStick SoulCaliber" },
|
||||
{ MAKE_VIDPID(0x1bad, 0xf042), "Mad Catz FightStick TES+" },
|
||||
{ MAKE_VIDPID(0x1bad, 0xf080), "Mad Catz FightStick TE2" },
|
||||
{ MAKE_VIDPID(0x1bad, 0xf501), "HoriPad EX2 Turbo" },
|
||||
{ MAKE_VIDPID(0x1bad, 0xf502), "Hori Real Arcade Pro.VX SA" },
|
||||
{ MAKE_VIDPID(0x1bad, 0xf503), "Hori Fighting Stick VX" },
|
||||
{ MAKE_VIDPID(0x1bad, 0xf504), "Hori Real Arcade Pro. EX" },
|
||||
{ MAKE_VIDPID(0x1bad, 0xf505), "Hori Fighting Stick EX2B" },
|
||||
{ MAKE_VIDPID(0x1bad, 0xf506), "Hori Real Arcade Pro.EX Premium VLX" },
|
||||
{ MAKE_VIDPID(0x1bad, 0xf900), "Harmonix Xbox 360 Controller" },
|
||||
{ MAKE_VIDPID(0x1bad, 0xf901), "Gamestop Xbox 360 Controller" },
|
||||
{ MAKE_VIDPID(0x1bad, 0xf903), "Tron Xbox 360 controller" },
|
||||
{ MAKE_VIDPID(0x1bad, 0xf904), "PDP Versus Fighting Pad" },
|
||||
{ MAKE_VIDPID(0x1bad, 0xf906), "MortalKombat FightStick" },
|
||||
{ MAKE_VIDPID(0x1bad, 0xfa01), "MadCatz GamePad" },
|
||||
{ MAKE_VIDPID(0x1bad, 0xfd00), "Razer Onza TE" },
|
||||
{ MAKE_VIDPID(0x1bad, 0xfd01), "Razer Onza" },
|
||||
{ MAKE_VIDPID(0x24c6, 0x5000), "Razer Atrox Arcade Stick" },
|
||||
{ MAKE_VIDPID(0x24c6, 0x5300), "PowerA MINI PROEX Controller" },
|
||||
{ MAKE_VIDPID(0x24c6, 0x5303), "Xbox Airflo wired controller" },
|
||||
{ MAKE_VIDPID(0x24c6, 0x530a), "Xbox 360 Pro EX Controller" },
|
||||
{ MAKE_VIDPID(0x24c6, 0x531a), "PowerA Pro Ex" },
|
||||
{ MAKE_VIDPID(0x24c6, 0x5397), "FUS1ON Tournament Controller" },
|
||||
{ MAKE_VIDPID(0x24c6, 0x541a), "PowerA Xbox One Mini Wired Controller" },
|
||||
{ MAKE_VIDPID(0x24c6, 0x542a), "Xbox ONE spectra" },
|
||||
{ MAKE_VIDPID(0x24c6, 0x543a), "PowerA Xbox One wired controller" },
|
||||
{ MAKE_VIDPID(0x24c6, 0x5500), "Hori XBOX 360 EX 2 with Turbo" },
|
||||
{ MAKE_VIDPID(0x24c6, 0x5501), "Hori Real Arcade Pro VX-SA" },
|
||||
{ MAKE_VIDPID(0x24c6, 0x5502), "Hori Fighting Stick VX Alt" },
|
||||
{ MAKE_VIDPID(0x24c6, 0x5503), "Hori Fighting Edge" },
|
||||
{ MAKE_VIDPID(0x24c6, 0x5506), "Hori SOULCALIBUR V Stick" },
|
||||
{ MAKE_VIDPID(0x24c6, 0x550d), "Hori GEM Xbox controller" },
|
||||
{ MAKE_VIDPID(0x24c6, 0x550e), "Hori Real Arcade Pro V Kai 360" },
|
||||
{ MAKE_VIDPID(0x24c6, 0x551a), "PowerA FUSION Pro Controller" },
|
||||
{ MAKE_VIDPID(0x24c6, 0x561a), "PowerA FUSION Controller" },
|
||||
{ MAKE_VIDPID(0x24c6, 0x5b00), "ThrustMaster Ferrari 458 Racing Wheel" },
|
||||
{ MAKE_VIDPID(0x24c6, 0x5b02), "Thrustmaster, Inc. GPX Controller" },
|
||||
{ MAKE_VIDPID(0x24c6, 0x5b03), "Thrustmaster Ferrari 458 Racing Wheel" },
|
||||
{ MAKE_VIDPID(0x24c6, 0x5d04), "Razer Sabertooth" },
|
||||
{ MAKE_VIDPID(0x24c6, 0xfafe), "Rock Candy Gamepad for Xbox 360" },
|
||||
};
|
||||
int i;
|
||||
Uint32 vidpid = MAKE_VIDPID(vendor_id, product_id);
|
||||
|
||||
for (i = 0; i < SDL_arraysize(names); ++i) {
|
||||
if (vidpid == names[i].vidpid) {
|
||||
return names[i].name;
|
||||
}
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static SDL_bool
|
||||
HIDAPI_IsDeviceSupported(Uint16 vendor_id, Uint16 product_id, Uint16 version)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
|
||||
#ifdef __WINDOWS__
|
||||
/* On Windows, Xbox controllers are handled by the XInput driver */
|
||||
#undef SDL_JOYSTICK_HIDAPI_XBOX360
|
||||
//#undef SDL_JOYSTICK_HIDAPI_XBOX360
|
||||
#undef SDL_JOYSTICK_HIDAPI_XBOXONE
|
||||
#endif
|
||||
|
||||
|
|
@ -65,6 +65,9 @@ extern SDL_HIDAPI_DeviceDriver SDL_HIDAPI_DriverXboxOne;
|
|||
/* Return true if a HID device is present and supported as a joystick */
|
||||
extern SDL_bool HIDAPI_IsDevicePresent(Uint16 vendor_id, Uint16 product_id, Uint16 version);
|
||||
|
||||
/* Return the name of an Xbox 360 or Xbox One controller */
|
||||
extern const char *HIDAPI_XboxControllerName(Uint16 vendor_id, Uint16 product_id);
|
||||
|
||||
#endif /* SDL_JOYSTICK_HIDAPI_H */
|
||||
|
||||
/* vi: set ts=4 sw=4 expandtab: */
|
||||
|
|
|
|||
Loading…
Reference in New Issue