From 6493be9eea37dee0f0e165353d35488ea96e356d Mon Sep 17 00:00:00 2001
From: Sam Lantinga <slouken@libsdl.org>
Date: Mon, 3 Nov 2025 08:20:41 -0800
Subject: [PATCH] Removed SDL_AUTO_ENABLE_ENHANCED_FLYDIGI

---
 src/joystick/hidapi/SDL_hidapi_flydigi.c | 15 ---------------
 src/joystick/hidapi/SDL_hidapi_flydigi.h |  4 ----
 src/joystick/hidapi/SDL_hidapijoystick.c |  4 ----
 3 files changed, 23 deletions(-)

diff --git a/src/joystick/hidapi/SDL_hidapi_flydigi.c b/src/joystick/hidapi/SDL_hidapi_flydigi.c
index deb4da588b..4b42673761 100644
--- a/src/joystick/hidapi/SDL_hidapi_flydigi.c
+++ b/src/joystick/hidapi/SDL_hidapi_flydigi.c
@@ -294,22 +294,7 @@ static bool HIDAPI_DriverFlydigi_InitControllerV2(SDL_HIDAPI_Device *device)
     if (data[10] == 1) {
         ctx->available = true;
     } else {
-#ifdef SDL_AUTO_ENABLE_ENHANCED_FLYDIGI
-        // The FlyDigi Space Station app isn't available, we need to enable this ourselves
-        Uint8 enable_acquire[] = {
-            FLYDIGI_V2_CMD_REPORT_ID,
-            FLYDIGI_V2_MAGIC1,
-            FLYDIGI_V2_MAGIC2,
-            FLYDIGI_V2_SET_STATUS_COMMAND,
-            0x07, 0xff, 0xff, 0xff, 0xff, 0x01, 0x15
-        };
-        if (SDL_hid_write(device->dev, enable_acquire, sizeof(enable_acquire)) < 0) {
-            return SDL_SetError("Couldn't set controller status");
-        }
-#else
         // Click "Allow third-party apps to take over mappings" in the FlyDigi Space Station app
-
-#endif // SDL_AUTO_ENABLE_ENHANCED_FLYDIGI
     }
     return true;
 }
diff --git a/src/joystick/hidapi/SDL_hidapi_flydigi.h b/src/joystick/hidapi/SDL_hidapi_flydigi.h
index fc685bea54..42d6ef7ee2 100644
--- a/src/joystick/hidapi/SDL_hidapi_flydigi.h
+++ b/src/joystick/hidapi/SDL_hidapi_flydigi.h
@@ -36,7 +36,3 @@ typedef enum
     SDL_FLYDIGI_VADER4_PRO,
 } SDL_FlyDigiControllerType;
 
-#ifndef SDL_PLATFORM_WINDOWS
-// The FlyDigi Space Station app isn't available on this platform
-#define SDL_AUTO_ENABLE_ENHANCED_FLYDIGI
-#endif
diff --git a/src/joystick/hidapi/SDL_hidapijoystick.c b/src/joystick/hidapi/SDL_hidapijoystick.c
index 0ec47acefb..07e7e3552e 100644
--- a/src/joystick/hidapi/SDL_hidapijoystick.c
+++ b/src/joystick/hidapi/SDL_hidapijoystick.c
@@ -1305,9 +1305,6 @@ bool HIDAPI_IsDevicePresent(Uint16 vendor_id, Uint16 product_id, Uint16 version,
      */
     SDL_LockJoysticks();
     for (device = SDL_HIDAPI_devices; device; device = device->next) {
-#ifdef SDL_AUTO_ENABLE_ENHANCED_FLYDIGI
-        // The HIDAPI functionality will always be available, so ignore the XInput interface
-#else
         // The HIDAPI functionality will be available when the FlyDigi Space Station app has
         // enabled third party controller mapping, so the driver needs to be active to watch
         // for that change. Since this is dynamic and we don't have a way to re-trigger device
@@ -1317,7 +1314,6 @@ bool HIDAPI_IsDevicePresent(Uint16 vendor_id, Uint16 product_id, Uint16 version,
         if (device->vendor_id == USB_VENDOR_FLYDIGI_V2) {
             continue;
         }
-#endif // SDL_AUTO_ENABLE_ENHANCED_FLYDIGI
 
         if (device->driver &&
             HIDAPI_IsEquivalentToDevice(vendor_id, product_id, device)) {