encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed blacklist entries for devices that aren't game controllers, allow Steam Controllers

This commit is contained in:
Sam Lantinga 2020-03-20 20:53:26 -07:00
parent 5ed71f3bc0
commit 6e646b6156
1 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/hidapi/windows/hid.c
View File

@ -73,6 +73,7 @@ typedef LONG NTSTATUS;
#define USAGE_JOYSTICK 0x0004 #define USAGE_JOYSTICK 0x0004
#define USAGE_GAMEPAD 0x0005 #define USAGE_GAMEPAD 0x0005
#define USAGE_MULTIAXISCONTROLLER 0x0008 #define USAGE_MULTIAXISCONTROLLER 0x0008
#define USB_VENDOR_VALVE 0x28de
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@ -325,18 +326,6 @@ int hid_blacklist(unsigned short vendor_id, unsigned short product_id)
return 1; return 1;
} }
// Sound BlasterX G1 - Causes 10 second stalls when asking for manufacturer's string
if ( vendor_id == 0x041E && product_id == 0x3249 )
{
return 1;
}
// Apple Cinema HD display 30" - takes a long time to return the product string
if ( vendor_id == 0x05AC && product_id == 0x9220 )
{
return 1;
}
return 0; return 0;
} }
@ -496,12 +485,14 @@ struct hid_device_info HID_API_EXPORT * HID_API_CALL hid_enumerate(unsigned shor
/* SDL Modification: Ignore the device if it's not a gamepad. This limits compatibility /* SDL Modification: Ignore the device if it's not a gamepad. This limits compatibility
risk from devices that may respond poorly to our string queries below. */ risk from devices that may respond poorly to our string queries below. */
if (attrib.VendorID != USB_VENDOR_VALVE) {
if (caps.UsagePage != USAGE_PAGE_GENERIC_DESKTOP) { if (caps.UsagePage != USAGE_PAGE_GENERIC_DESKTOP) {
goto cont_close; goto cont_close;
} }
if (caps.Usage != USAGE_JOYSTICK && caps.Usage != USAGE_GAMEPAD && caps.Usage != USAGE_MULTIAXISCONTROLLER) { if (caps.Usage != USAGE_JOYSTICK && caps.Usage != USAGE_GAMEPAD && caps.Usage != USAGE_MULTIAXISCONTROLLER) {
goto cont_close; goto cont_close;
} }
}
/* VID/PID match. Create the record. */ /* VID/PID match. Create the record. */
tmp = (struct hid_device_info*) calloc(1, sizeof(struct hid_device_info)); tmp = (struct hid_device_info*) calloc(1, sizeof(struct hid_device_info));