Browse Source

Assume all 8BitDo Xbox controllers have a share button

Fixes https://github.com/libsdl-org/SDL/issues/8174
Sam Lantinga 1 year ago
parent
commit
8049af3355
2 changed files with 7 additions and 4 deletions
  1. 7 3
      src/joystick/SDL_joystick.c
  2. 0 1
      src/joystick/usb_ids.h

+ 7 - 3
src/joystick/SDL_joystick.c

@@ -2503,9 +2503,13 @@ SDL_bool SDL_IsJoystickXboxSeriesX(Uint16 vendor_id, Uint16 product_id)
         }
     }
     if (vendor_id == USB_VENDOR_8BITDO) {
-        if (product_id == USB_PRODUCT_8BITDO_XBOX_CONTROLLER) {
-            return SDL_TRUE;
-        }
+        /* 8BitDo started making Xbox form factor controllers after the Series X
+         * release, so we'll assume for now that they all have the share button.
+         *
+         * We know for sure that the Ultimate Wired Controller for Xbox (0x2002)
+         * and the Ultimate Wireless / Pro 2 Wired Controller (0x3106) have them.
+         */
+        return SDL_TRUE;
     }
     if (vendor_id == USB_VENDOR_GAMESIR) {
         if (product_id == USB_PRODUCT_GAMESIR_G7) {

+ 0 - 1
src/joystick/usb_ids.h

@@ -55,7 +55,6 @@
 #define USB_VENDOR_VALVE        0x28de
 #define USB_VENDOR_ZEROPLUS     0x0c12
 
-#define USB_PRODUCT_8BITDO_XBOX_CONTROLLER                0x2002
 #define USB_PRODUCT_AMAZON_LUNA_CONTROLLER                0x0419
 #define USB_PRODUCT_ASTRO_C40_XBOX360                     0x0024
 #define USB_PRODUCT_BACKBONE_ONE_IOS                      0x0103