Commit 6e646b615699a08eeeec9df73a39965abb384cd2
2020-03-20T20:53:26
Removed blacklist entries for devices that aren't game controllers, allow Steam Controllers
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50
diff --git a/src/hidapi/windows/hid.c b/src/hidapi/windows/hid.c
index 831e003..715450c 100644
--- a/src/hidapi/windows/hid.c
+++ b/src/hidapi/windows/hid.c
@@ -73,6 +73,7 @@ typedef LONG NTSTATUS;
#define USAGE_JOYSTICK 0x0004
#define USAGE_GAMEPAD 0x0005
#define USAGE_MULTIAXISCONTROLLER 0x0008
+#define USB_VENDOR_VALVE 0x28de
#ifdef __cplusplus
extern "C" {
@@ -325,18 +326,6 @@ int hid_blacklist(unsigned short vendor_id, unsigned short product_id)
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;
}
@@ -496,11 +485,13 @@ 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
risk from devices that may respond poorly to our string queries below. */
- if (caps.UsagePage != USAGE_PAGE_GENERIC_DESKTOP) {
- goto cont_close;
- }
- if (caps.Usage != USAGE_JOYSTICK && caps.Usage != USAGE_GAMEPAD && caps.Usage != USAGE_MULTIAXISCONTROLLER) {
- goto cont_close;
+ if (attrib.VendorID != USB_VENDOR_VALVE) {
+ if (caps.UsagePage != USAGE_PAGE_GENERIC_DESKTOP) {
+ goto cont_close;
+ }
+ if (caps.Usage != USAGE_JOYSTICK && caps.Usage != USAGE_GAMEPAD && caps.Usage != USAGE_MULTIAXISCONTROLLER) {
+ goto cont_close;
+ }
}
/* VID/PID match. Create the record. */