geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't update the device list for devices we know aren't supported 

This should reduce HID enumeration (hitting the USB bus) if for some reason we're getting spammed with false device insert/removal events
Sam Lantinga 2018-08-09 16:04:30 -07:00
parent cf823094a2
commit ab07ce1166
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/joystick/hidapi/SDL_hidapijoystick.c
View File

@ -79,6 +79,20 @@ static SDL_HIDAPI_Device *SDL_HIDAPI_devices;
static int SDL_HIDAPI_numjoysticks = 0; static int SDL_HIDAPI_numjoysticks = 0;
static Uint32 SDL_HIDAPI_last_detect = 0; static Uint32 SDL_HIDAPI_last_detect = 0;
static SDL_bool
HIDAPI_IsDeviceSupported(Uint16 vendor_id, Uint16 product_id)
{
int i;
for (i = 0; i < SDL_arraysize(SDL_HIDAPI_drivers); ++i) {
SDL_HIDAPI_DeviceDriver *driver = SDL_HIDAPI_drivers[i];
if (driver->enabled && driver->IsSupportedDevice(vendor_id, product_id, -1, 0, 0)) {
return SDL_TRUE;
}
}
return SDL_FALSE;
}
static SDL_HIDAPI_DeviceDriver * static SDL_HIDAPI_DeviceDriver *
HIDAPI_GetDeviceDriver(SDL_HIDAPI_Device *device) HIDAPI_GetDeviceDriver(SDL_HIDAPI_Device *device)
{ {
@ -388,6 +402,11 @@ HIDAPI_IsDevicePresent(Uint16 vendor_id, Uint16 product_id)
{ {
SDL_HIDAPI_Device *device; SDL_HIDAPI_Device *device;
/* Don't update the device list for devices we know aren't supported */
if (!HIDAPI_IsDeviceSupported(vendor_id, product_id)) {
return SDL_FALSE;
}
/* Make sure the device list is completely up to date when we check for device presence */ /* Make sure the device list is completely up to date when we check for device presence */
HIDAPI_UpdateDeviceList(); HIDAPI_UpdateDeviceList();