Browse Source

Always use 'm' for controllers provided by the MFI joystick driver

This makes sure that SDL_JoystickGUIDUsesVersion() returns false and we don't try to match against other similar controllers using old mappings.
Sam Lantinga 1 year ago
parent
commit
119e02f314
1 changed files with 1 additions and 6 deletions
  1. 1 6
      src/joystick/apple/SDL_mfijoystick.m

+ 1 - 6
src/joystick/apple/SDL_mfijoystick.m

@@ -659,12 +659,7 @@ static BOOL IOS_AddMFIJoystickDevice(SDL_JoystickDeviceItem *device, GCControlle
     } else {
         signature = device->button_mask;
     }
-    if (vendor == USB_VENDOR_APPLE) {
-        /* Note that this is an MFI controller and what subtype it is */
-        device->guid = SDL_CreateJoystickGUID(SDL_HARDWARE_BUS_BLUETOOTH, vendor, product, signature, name, 'm', subtype);
-    } else {
-        device->guid = SDL_CreateJoystickGUID(SDL_HARDWARE_BUS_BLUETOOTH, vendor, product, signature, name, 0, subtype);
-    }
+    device->guid = SDL_CreateJoystickGUID(SDL_HARDWARE_BUS_BLUETOOTH, vendor, product, signature, name, 'm', subtype);
 
     /* This will be set when the first button press of the controller is
      * detected. */