Assume new XBox controllers have a share button

The list of old XBox controllers was taken from controller_list.h, removing controllers already known to have a share button.

src/joystick/SDL_joystick.c

@@ -125,6 +125,172 @@ static int SDL_joystick_player_count SDL_GUARDED_BY(SDL_joystick_lock) = 0;
 static SDL_JoystickID *SDL_joystick_players SDL_GUARDED_BY(SDL_joystick_lock) = NULL;
 static bool SDL_joystick_allows_background_events = false;
 
+static Uint32 initial_old_xboxone_controllers[] = {
+    MAKE_VIDPID(0x0000, 0x6686),
+    MAKE_VIDPID(0x0079, 0x18a1),
+    MAKE_VIDPID(0x0079, 0x18c2),
+    MAKE_VIDPID(0x0079, 0x18c8),
+    MAKE_VIDPID(0x0079, 0x18cf),
+    MAKE_VIDPID(0x03f0, 0x0495),
+    MAKE_VIDPID(0x045e, 0x02d1),
+    MAKE_VIDPID(0x045e, 0x02dd),
+    MAKE_VIDPID(0x045e, 0x02e0),
+    MAKE_VIDPID(0x045e, 0x02e3),
+    MAKE_VIDPID(0x045e, 0x02ea),
+    MAKE_VIDPID(0x045e, 0x02fd),
+    MAKE_VIDPID(0x045e, 0x02ff),
+    MAKE_VIDPID(0x045e, 0x0867),
+    MAKE_VIDPID(0x045e, 0x0b00),
+    MAKE_VIDPID(0x045e, 0x0b05),
+    MAKE_VIDPID(0x045e, 0x0b0a),
+    MAKE_VIDPID(0x045e, 0x0b0c),
+    MAKE_VIDPID(0x045e, 0x0b20),
+    MAKE_VIDPID(0x045e, 0x0b21),
+    MAKE_VIDPID(0x045e, 0x0b22),
+    MAKE_VIDPID(0x046d, 0x0000),
+    MAKE_VIDPID(0x046d, 0x1004),
+    MAKE_VIDPID(0x046d, 0x1007),
+    MAKE_VIDPID(0x046d, 0x1008),
+    MAKE_VIDPID(0x046d, 0xf301),
+    MAKE_VIDPID(0x0738, 0x02a0),
+    MAKE_VIDPID(0x0738, 0x4a01),
+    MAKE_VIDPID(0x0738, 0x7263),
+    MAKE_VIDPID(0x0738, 0xb738),
+    MAKE_VIDPID(0x0738, 0xcb29),
+    MAKE_VIDPID(0x0738, 0xf401),
+    MAKE_VIDPID(0x0c12, 0x0e17),
+    MAKE_VIDPID(0x0c12, 0x0e1c),
+    MAKE_VIDPID(0x0c12, 0x0e22),
+    MAKE_VIDPID(0x0c12, 0x0e30),
+    MAKE_VIDPID(0x0d62, 0x9a1a),
+    MAKE_VIDPID(0x0d62, 0x9a1b),
+    MAKE_VIDPID(0x0e00, 0x0e00),
+    MAKE_VIDPID(0x0e6f, 0x012a),
+    MAKE_VIDPID(0x0e6f, 0x0139),
+    MAKE_VIDPID(0x0e6f, 0x013B),
+    MAKE_VIDPID(0x0e6f, 0x013a),
+    MAKE_VIDPID(0x0e6f, 0x0145),
+    MAKE_VIDPID(0x0e6f, 0x0146),
+    MAKE_VIDPID(0x0e6f, 0x0152),
+    MAKE_VIDPID(0x0e6f, 0x015b),
+    MAKE_VIDPID(0x0e6f, 0x015c),
+    MAKE_VIDPID(0x0e6f, 0x015d),
+    MAKE_VIDPID(0x0e6f, 0x015f),
+    MAKE_VIDPID(0x0e6f, 0x0160),
+    MAKE_VIDPID(0x0e6f, 0x0161),
+    MAKE_VIDPID(0x0e6f, 0x0162),
+    MAKE_VIDPID(0x0e6f, 0x0163),
+    MAKE_VIDPID(0x0e6f, 0x0164),
+    MAKE_VIDPID(0x0e6f, 0x0165),
+    MAKE_VIDPID(0x0e6f, 0x0166),
+    MAKE_VIDPID(0x0e6f, 0x0167),
+    MAKE_VIDPID(0x0e6f, 0x0205),
+    MAKE_VIDPID(0x0e6f, 0x0206),
+    MAKE_VIDPID(0x0e6f, 0x0246),
+    MAKE_VIDPID(0x0e6f, 0x0261),
+    MAKE_VIDPID(0x0e6f, 0x0262),
+    MAKE_VIDPID(0x0e6f, 0x02a0),
+    MAKE_VIDPID(0x0e6f, 0x02a1),
+    MAKE_VIDPID(0x0e6f, 0x02a2),
+    MAKE_VIDPID(0x0e6f, 0x02a3),
+    MAKE_VIDPID(0x0e6f, 0x02a4),
+    MAKE_VIDPID(0x0e6f, 0x02a5),
+    MAKE_VIDPID(0x0e6f, 0x02a6),
+    MAKE_VIDPID(0x0e6f, 0x02a7),
+    MAKE_VIDPID(0x0e6f, 0x02a8),
+    MAKE_VIDPID(0x0e6f, 0x02a9),
+    MAKE_VIDPID(0x0e6f, 0x02aa),
+    MAKE_VIDPID(0x0e6f, 0x02ab),
+    MAKE_VIDPID(0x0e6f, 0x02ac),
+    MAKE_VIDPID(0x0e6f, 0x02ad),
+    MAKE_VIDPID(0x0e6f, 0x02ae),
+    MAKE_VIDPID(0x0e6f, 0x02af),
+    MAKE_VIDPID(0x0e6f, 0x02b0),
+    MAKE_VIDPID(0x0e6f, 0x02b1),
+    MAKE_VIDPID(0x0e6f, 0x02b2),
+    MAKE_VIDPID(0x0e6f, 0x02b3),
+    MAKE_VIDPID(0x0e6f, 0x02b5),
+    MAKE_VIDPID(0x0e6f, 0x02b6),
+    MAKE_VIDPID(0x0e6f, 0x02b8),
+    MAKE_VIDPID(0x0e6f, 0x02bd),
+    MAKE_VIDPID(0x0e6f, 0x02be),
+    MAKE_VIDPID(0x0e6f, 0x02bf),
+    MAKE_VIDPID(0x0e6f, 0x02c0),
+    MAKE_VIDPID(0x0e6f, 0x02c1),
+    MAKE_VIDPID(0x0e6f, 0x02c2),
+    MAKE_VIDPID(0x0e6f, 0x02c3),
+    MAKE_VIDPID(0x0e6f, 0x02c4),
+    MAKE_VIDPID(0x0e6f, 0x02c5),
+    MAKE_VIDPID(0x0e6f, 0x02c6),
+    MAKE_VIDPID(0x0e6f, 0x02c7),
+    MAKE_VIDPID(0x0e6f, 0x02c8),
+    MAKE_VIDPID(0x0e6f, 0x02c9),
+    MAKE_VIDPID(0x0e6f, 0x02ca),
+    MAKE_VIDPID(0x0e6f, 0x02cb),
+    MAKE_VIDPID(0x0e6f, 0x02cd),
+    MAKE_VIDPID(0x0e6f, 0x02ce),
+    MAKE_VIDPID(0x0e6f, 0x02cf),
+    MAKE_VIDPID(0x0e6f, 0x02d5),
+    MAKE_VIDPID(0x0e6f, 0x0346),
+    MAKE_VIDPID(0x0e6f, 0x0446),
+    MAKE_VIDPID(0x0e6f, 0xf501),
+    MAKE_VIDPID(0x0f0d, 0x0063),
+    MAKE_VIDPID(0x0f0d, 0x0067),
+    MAKE_VIDPID(0x0f0d, 0x0078),
+    MAKE_VIDPID(0x0f0d, 0x0097),
+    MAKE_VIDPID(0x0f0d, 0x00ba),
+    MAKE_VIDPID(0x0f0d, 0x00c0),
+    MAKE_VIDPID(0x0f0d, 0x00c5),
+    MAKE_VIDPID(0x0f0d, 0x00d8),
+    MAKE_VIDPID(0x0f0d, 0x00ed),
+    MAKE_VIDPID(0x0fff, 0x02a1),
+    MAKE_VIDPID(0x12ab, 0x0304),
+    MAKE_VIDPID(0x1430, 0x0291),
+    MAKE_VIDPID(0x1430, 0x02a9),
+    MAKE_VIDPID(0x1430, 0x070b),
+    MAKE_VIDPID(0x1430, 0x0719),
+    MAKE_VIDPID(0x146b, 0x0611),
+    MAKE_VIDPID(0x1532, 0x0a00),
+    MAKE_VIDPID(0x1532, 0x0a03),
+    MAKE_VIDPID(0x1532, 0x0a14),
+    MAKE_VIDPID(0x1532, 0x0a15),
+    MAKE_VIDPID(0x16d0, 0x0f3f),
+    MAKE_VIDPID(0x1bad, 0x028e),
+    MAKE_VIDPID(0x1bad, 0x02a0),
+    MAKE_VIDPID(0x1bad, 0x5500),
+    MAKE_VIDPID(0x20ab, 0x55ef),
+    MAKE_VIDPID(0x24c6, 0x541a),
+    MAKE_VIDPID(0x24c6, 0x542a),
+    MAKE_VIDPID(0x24c6, 0x543a),
+    MAKE_VIDPID(0x24c6, 0x5509),
+    MAKE_VIDPID(0x24c6, 0x551a),
+    MAKE_VIDPID(0x24c6, 0x561a),
+    MAKE_VIDPID(0x24c6, 0x581a),
+    MAKE_VIDPID(0x24c6, 0x591a),
+    MAKE_VIDPID(0x24c6, 0x592a),
+    MAKE_VIDPID(0x24c6, 0x791a),
+    MAKE_VIDPID(0x2516, 0x0069),
+    MAKE_VIDPID(0x25b1, 0x0360),
+    MAKE_VIDPID(0x2c22, 0x2203),
+    MAKE_VIDPID(0x2e24, 0x0652),
+    MAKE_VIDPID(0x2e24, 0x1618),
+    MAKE_VIDPID(0x2e24, 0x1688),
+    MAKE_VIDPID(0x2f24, 0x0011),
+    MAKE_VIDPID(0x2f24, 0x002e),
+    MAKE_VIDPID(0x2f24, 0x0050),
+    MAKE_VIDPID(0x2f24, 0x0053),
+    MAKE_VIDPID(0x2f24, 0x008f),
+    MAKE_VIDPID(0x2f24, 0x0091),
+    MAKE_VIDPID(0x2f24, 0x00b7),
+    MAKE_VIDPID(0xd2d2, 0xd2d2),
+};
+static SDL_vidpid_list old_xboxone_controllers = {
+    "SDL_JOYSTICK_OLD_XBOXONE_CONTROLLERS", 0, 0, NULL,
+    "SDL_JOYSTICK_OLD_XBOXONE_CONTROLLERS_EXCLUDED", 0, 0, NULL,
+    SDL_arraysize(initial_old_xboxone_controllers), initial_old_xboxone_controllers,
+    false
+};
+
 static Uint32 initial_arcadestick_devices[] = {
     MAKE_VIDPID(0x0079, 0x181a), // Venom Arcade Stick
     MAKE_VIDPID(0x0079, 0x181b), // Venom Arcade Stick
@@ -638,6 +804,7 @@ bool SDL_InitJoysticks(void)
 
     SDL_InitGamepadMappings();
 
+    SDL_LoadVIDPIDList(&old_xboxone_controllers);
     SDL_LoadVIDPIDList(&arcadestick_devices);
     SDL_LoadVIDPIDList(&blacklist_devices);
     SDL_LoadVIDPIDList(&flightstick_devices);
@@ -1989,6 +2156,7 @@ void SDL_QuitJoysticks(void)
     SDL_RemoveHintCallback(SDL_HINT_JOYSTICK_ALLOW_BACKGROUND_EVENTS,
                         SDL_JoystickAllowBackgroundEventsChanged, NULL);
 
+    SDL_FreeVIDPIDList(&old_xboxone_controllers);
     SDL_FreeVIDPIDList(&arcadestick_devices);
     SDL_FreeVIDPIDList(&blacklist_devices);
     SDL_FreeVIDPIDList(&flightstick_devices);
@@ -2834,78 +3002,12 @@ bool SDL_IsJoystickXboxOneElite(Uint16 vendor_id, Uint16 product_id)
 
 bool SDL_IsJoystickXboxSeriesX(Uint16 vendor_id, Uint16 product_id)
 {
-    if (vendor_id == USB_VENDOR_MICROSOFT) {
-        if (product_id == USB_PRODUCT_XBOX_SERIES_X ||
-            product_id == USB_PRODUCT_XBOX_SERIES_X_BLE) {
-            return true;
-        }
-    }
-    if (vendor_id == USB_VENDOR_PDP) {
-        if (product_id == USB_PRODUCT_XBOX_SERIES_X_VICTRIX_GAMBIT ||
-            product_id == USB_PRODUCT_XBOX_SERIES_X_PDP_BLUE ||
-            product_id == USB_PRODUCT_XBOX_SERIES_X_PDP_AFTERGLOW) {
-            return true;
-        }
-    }
-    if (vendor_id == USB_VENDOR_POWERA_ALT) {
-        if ((product_id >= 0x2001 && product_id <= 0x201a) ||
-            product_id == USB_PRODUCT_XBOX_SERIES_X_POWERA_FUSION_PRO2 ||
-            product_id == USB_PRODUCT_XBOX_SERIES_X_POWERA_FUSION_PRO4 ||
-            product_id == USB_PRODUCT_XBOX_SERIES_X_POWERA_FUSION_PRO_WIRELESS_USB ||
-            product_id == USB_PRODUCT_XBOX_SERIES_X_POWERA_FUSION_PRO_WIRELESS_DONGLE ||
-            product_id == USB_PRODUCT_XBOX_SERIES_X_POWERA_MOGA_XP_ULTRA ||
-            product_id == USB_PRODUCT_XBOX_SERIES_X_POWERA_SPECTRA) {
-            return true;
-        }
-    }
-    if (vendor_id == USB_VENDOR_HORI) {
-        if (product_id == USB_PRODUCT_HORI_FIGHTING_COMMANDER_OCTA_SERIES_X ||
-            product_id == USB_PRODUCT_HORI_HORIPAD_PRO_SERIES_X ||
-            product_id == USB_PRODUCT_HORI_TAIKO_DRUM_CONTROLLER) {
-            return true;
-        }
-    }
-    if (vendor_id == USB_VENDOR_HP) {
-        if (product_id == USB_PRODUCT_XBOX_SERIES_X_HP_HYPERX ||
-            product_id == USB_PRODUCT_XBOX_SERIES_X_HP_HYPERX_RGB) {
-            return true;
-        }
-    }
-    if (vendor_id == USB_VENDOR_RAZER) {
-        if (product_id == USB_PRODUCT_RAZER_WOLVERINE_V2 ||
-            product_id == USB_PRODUCT_RAZER_WOLVERINE_V2_CHROMA ||
-            product_id == USB_PRODUCT_RAZER_WOLVERINE_V3_PRO) {
-            return true;
-        }
-    }
-    if (vendor_id == USB_VENDOR_THRUSTMASTER) {
-        if (product_id == USB_PRODUCT_THRUSTMASTER_ESWAPX_PRO_SERIES_X) {
-            return true;
-        }
-    }
-    if (vendor_id == USB_VENDOR_TURTLE_BEACH) {
-        if (product_id == USB_PRODUCT_TURTLE_BEACH_SERIES_X_REACT_R ||
-            product_id == USB_PRODUCT_TURTLE_BEACH_SERIES_X_RECON) {
-            return true;
-        }
-    }
-    if (vendor_id == USB_VENDOR_8BITDO) {
-        if (product_id == USB_PRODUCT_8BITDO_XBOX_CONTROLLER1 ||
-            product_id == USB_PRODUCT_8BITDO_XBOX_CONTROLLER2) {
-            return true;
-        }
-    }
-    if (vendor_id == USB_VENDOR_GAMESIR) {
-        if (product_id == USB_PRODUCT_GAMESIR_G7) {
-            return true;
-        }
-    }
-    if (vendor_id == USB_VENDOR_ASUS) {
-        if (product_id == USB_PRODUCT_ROG_RAIKIRI) {
-            return true;
-        }
+    // Most new controllers have the share button, so we'll default to true and
+    // have a list of older XBox One controllers that are known not to have it.
+    if (SDL_VIDPIDInList(vendor_id, product_id, &old_xboxone_controllers)) {
+        return false;
     }
-    return false;
+    return true;
 }
 
 bool SDL_IsJoystickBluetoothXboxOne(Uint16 vendor_id, Uint16 product_id)

src/joystick/controller_list.h

@@ -481,10 +481,8 @@ static const ControllerDescription_t arrControllers[] = {
 	{ MAKE_CONTROLLER_ID( 0xf0d, 0xed ), k_eControllerType_XBoxOneController, NULL },	// Unknown Controller
 	{ MAKE_CONTROLLER_ID( 0xf0d, 0xc0 ), k_eControllerType_XBoxOneController, NULL },	// Unknown Controller
 	{ MAKE_CONTROLLER_ID( 0xe6f, 0x152 ), k_eControllerType_XBoxOneController, NULL },	// Unknown Controller
-	{ MAKE_CONTROLLER_ID( 0xe6f, 0x2a7 ), k_eControllerType_XBoxOneController, NULL },	// Unknown Controller
 	{ MAKE_CONTROLLER_ID( 0x46d, 0x1007 ), k_eControllerType_XBoxOneController, NULL },	// Unknown Controller
 	{ MAKE_CONTROLLER_ID( 0xe6f, 0x2b8 ), k_eControllerType_XBoxOneController, NULL },	// Unknown Controller
-	{ MAKE_CONTROLLER_ID( 0xe6f, 0x2a8 ), k_eControllerType_XBoxOneController, NULL },	// Unknown Controller
 	{ MAKE_CONTROLLER_ID( 0x79, 0x18a1 ), k_eControllerType_XBoxOneController, NULL },	// Unknown Controller
 
 	// Added from Minidumps 10-9-19
@@ -525,14 +523,7 @@ static const ControllerDescription_t arrControllers[] = {
 	{ MAKE_CONTROLLER_ID( 0xd62,	0x9a1b ), k_eControllerType_XBoxOneController, NULL },	// Unknown Controller
 	{ MAKE_CONTROLLER_ID( 0xe00,	0xe00 ), k_eControllerType_XBoxOneController, NULL },	// Unknown Controller
 	{ MAKE_CONTROLLER_ID( 0xe6f,	0x12a ), k_eControllerType_XBoxOneController, NULL },	// Unknown Controller
-	{ MAKE_CONTROLLER_ID( 0xe6f,	0x2a1 ), k_eControllerType_XBoxOneController, NULL },	// Unknown Controller
-	{ MAKE_CONTROLLER_ID( 0xe6f,	0x2a2 ), k_eControllerType_XBoxOneController, NULL },	// Unknown Controller
-	{ MAKE_CONTROLLER_ID( 0xe6f,	0x2a5 ), k_eControllerType_XBoxOneController, NULL },	// Unknown Controller
 	{ MAKE_CONTROLLER_ID( 0xe6f,	0x2b2 ), k_eControllerType_XBoxOneController, NULL },	// Unknown Controller
-	{ MAKE_CONTROLLER_ID( 0xe6f,	0x2bd ), k_eControllerType_XBoxOneController, NULL },	// Unknown Controller
-	{ MAKE_CONTROLLER_ID( 0xe6f,	0x2bf ), k_eControllerType_XBoxOneController, NULL },	// Unknown Controller
-	{ MAKE_CONTROLLER_ID( 0xe6f,	0x2c0 ), k_eControllerType_XBoxOneController, NULL },	// Unknown Controller
-	{ MAKE_CONTROLLER_ID( 0xe6f,	0x2c6 ), k_eControllerType_XBoxOneController, NULL },	// Unknown Controller
 	{ MAKE_CONTROLLER_ID( 0xf0d,	0x97 ), k_eControllerType_XBoxOneController, NULL },	// Unknown Controller
 	{ MAKE_CONTROLLER_ID( 0xf0d,	0xba ), k_eControllerType_XBoxOneController, NULL },	// Unknown Controller
 	{ MAKE_CONTROLLER_ID( 0xf0d,	0xd8 ), k_eControllerType_XBoxOneController, NULL },	// Unknown Controller

src/joystick/usb_ids.h

@@ -59,25 +59,19 @@
 #define USB_VENDOR_VALVE        0x28de
 #define USB_VENDOR_ZEROPLUS     0x0c12
 
-#define USB_PRODUCT_8BITDO_XBOX_CONTROLLER1               0x2002 // Ultimate Wired Controller for Xbox
-#define USB_PRODUCT_8BITDO_XBOX_CONTROLLER2               0x3106 // Ultimate Wireless / Pro 2 Wired Controller
 #define USB_PRODUCT_8BITDO_ULTIMATE2_WIRELESS             0x6012
 #define USB_PRODUCT_AMAZON_LUNA_CONTROLLER                0x0419
 #define USB_PRODUCT_ASTRO_C40_XBOX360                     0x0024
 #define USB_PRODUCT_BACKBONE_ONE_IOS                      0x0103
 #define USB_PRODUCT_BACKBONE_ONE_IOS_PS5                  0x0104
-#define USB_PRODUCT_GAMESIR_G7                            0x1001
 #define USB_PRODUCT_GOOGLE_STADIA_CONTROLLER              0x9400
 #define USB_PRODUCT_EVORETRO_GAMECUBE_ADAPTER1            0x1843
 #define USB_PRODUCT_EVORETRO_GAMECUBE_ADAPTER2            0x1846
-#define USB_PRODUCT_HORI_FIGHTING_COMMANDER_OCTA_SERIES_X 0x0150
-#define USB_PRODUCT_HORI_HORIPAD_PRO_SERIES_X             0x014f
 #define USB_PRODUCT_HORI_FIGHTING_STICK_ALPHA_PS4         0x011c
 #define USB_PRODUCT_HORI_FIGHTING_STICK_ALPHA_PS5         0x0184
 #define USB_PRODUCT_HORI_FIGHTING_STICK_ALPHA_PS5         0x0184
 #define USB_PRODUCT_HORI_STEAM_CONTROLLER                 0x01AB
 #define USB_PRODUCT_HORI_STEAM_CONTROLLER_BT              0x0196
-#define USB_PRODUCT_HORI_TAIKO_DRUM_CONTROLLER            0x01b2
 #define USB_PRODUCT_LOGITECH_F310                         0xc216
 #define USB_PRODUCT_LOGITECH_CHILLSTREAM                  0xcad1
 #define USB_PRODUCT_MADCATZ_SAITEK_SIDE_PANEL_CONTROL_DECK 0x2218
@@ -114,7 +108,6 @@
 #define USB_PRODUCT_RAZER_WOLVERINE_V2_PRO_XBOX_WIRED     0x1010
 #define USB_PRODUCT_RAZER_WOLVERINE_V2_PRO_XBOX_WIRELESS  0x1011
 #define USB_PRODUCT_RAZER_WOLVERINE_V3_PRO                0x0a3f
-#define USB_PRODUCT_ROG_RAIKIRI                           0x1a38
 #define USB_PRODUCT_SAITEK_CYBORG_V3                      0xf622
 #define USB_PRODUCT_SHANWAN_DS3                           0x0523
 #define USB_PRODUCT_SONY_DS3                              0x0268
@@ -126,9 +119,6 @@
 #define USB_PRODUCT_SONY_DS5_EDGE                         0x0df2
 #define USB_PRODUCT_SWITCH_RETROBIT_CONTROLLER            0x0575
 #define USB_PRODUCT_THRUSTMASTER_ESWAPX_PRO_PS4           0xd00e
-#define USB_PRODUCT_THRUSTMASTER_ESWAPX_PRO_SERIES_X      0xd012
-#define USB_PRODUCT_TURTLE_BEACH_SERIES_X_REACT_R         0x7013
-#define USB_PRODUCT_TURTLE_BEACH_SERIES_X_RECON           0x7009
 #define USB_PRODUCT_VALVE_STEAM_CONTROLLER_DONGLE         0x1142
 #define USB_PRODUCT_VICTRIX_FS_PRO                        0x0203
 #define USB_PRODUCT_VICTRIX_FS_PRO_V2                     0x0207
@@ -150,17 +140,6 @@
 #define USB_PRODUCT_XBOX_ONE_S_REV2_BLE                   0x0b20
 #define USB_PRODUCT_XBOX_SERIES_X                         0x0b12
 #define USB_PRODUCT_XBOX_SERIES_X_BLE                     0x0b13
-#define USB_PRODUCT_XBOX_SERIES_X_HP_HYPERX               0x08b6
-#define USB_PRODUCT_XBOX_SERIES_X_HP_HYPERX_RGB           0x07a0
-#define USB_PRODUCT_XBOX_SERIES_X_PDP_AFTERGLOW           0x02da
-#define USB_PRODUCT_XBOX_SERIES_X_PDP_BLUE                0x02d9
-#define USB_PRODUCT_XBOX_SERIES_X_POWERA_FUSION_PRO2      0x4001
-#define USB_PRODUCT_XBOX_SERIES_X_POWERA_FUSION_PRO4      0x400b
-#define USB_PRODUCT_XBOX_SERIES_X_POWERA_FUSION_PRO_WIRELESS_USB    0x4014
-#define USB_PRODUCT_XBOX_SERIES_X_POWERA_FUSION_PRO_WIRELESS_DONGLE 0x4016
-#define USB_PRODUCT_XBOX_SERIES_X_POWERA_MOGA_XP_ULTRA    0x890b
-#define USB_PRODUCT_XBOX_SERIES_X_POWERA_SPECTRA          0x4002
-#define USB_PRODUCT_XBOX_SERIES_X_VICTRIX_GAMBIT          0x02d6
 #define USB_PRODUCT_XBOX_ONE_XBOXGIP_CONTROLLER           0x02ff // XBOXGIP driver software PID
 #define USB_PRODUCT_STEAM_VIRTUAL_GAMEPAD                 0x11ff