From f2f759dca34863a72eed8640ee90a4bf0472db6e Mon Sep 17 00:00:00 2001 From: Dimitriy Ryazantcev Date: Fri, 26 Feb 2021 15:34:34 +0200 Subject: [PATCH] Remove not used DirectInput ignored_devices list --- src/joystick/windows/SDL_dinputjoystick.c | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/src/joystick/windows/SDL_dinputjoystick.c b/src/joystick/windows/SDL_dinputjoystick.c index 98f4aaf98..b133cde43 100644 --- a/src/joystick/windows/SDL_dinputjoystick.c +++ b/src/joystick/windows/SDL_dinputjoystick.c @@ -399,7 +399,6 @@ EnumJoysticksCallback(const DIDEVICEINSTANCE * pdidInstance, VOID * pContext) { JoyStick_DeviceData *pNewJoystick; JoyStick_DeviceData *pPrevJoystick = NULL; - const DWORD devtype = (pdidInstance->dwDevType & 0xFF); Uint16 *guid16; Uint16 vendor = 0; Uint16 product = 0; @@ -407,22 +406,6 @@ EnumJoysticksCallback(const DIDEVICEINSTANCE * pdidInstance, VOID * pContext) WCHAR hidPath[MAX_PATH]; char *name; - if (devtype == DI8DEVTYPE_SUPPLEMENTAL) { - /* Add any supplemental devices that should be ignored here */ -#define MAKE_TABLE_ENTRY(VID, PID) ((((DWORD)PID)<<16)|VID) - static DWORD ignored_devices[] = { - MAKE_TABLE_ENTRY(0, 0) - }; -#undef MAKE_TABLE_ENTRY - unsigned int i; - - for (i = 0; i < SDL_arraysize(ignored_devices); ++i) { - if (pdidInstance->guidProduct.Data1 == ignored_devices[i]) { - return DIENUM_CONTINUE; - } - } - } - if (SDL_IsXInputDevice(pdidInstance->tszProductName, &pdidInstance->guidProduct)) { return DIENUM_CONTINUE; /* ignore XInput devices here, keep going. */ }