gitea/SDL3_fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed hang sending output reports to the NVIDIA SHIELD Controller on macOS

Browse Source
This commit is contained in:
Sam Lantinga
2026-01-27 13:51:16 -08:00
parent cae2a28f5b
commit 72343b9ee2
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/joystick/hidapi/SDL_hidapi_shield.c
View File

@@ -29,7 +29,9 @@
#ifdef SDL_JOYSTICK_HIDAPI_SHIELD #ifdef SDL_JOYSTICK_HIDAPI_SHIELD
// Define this if you want to log all packets from the controller // Define this if you want to log all packets from the controller
// #define DEBUG_SHIELD_PROTOCOL #if 0
#define DEBUG_SHIELD_PROTOCOL
#endif
#define CMD_BATTERY_STATE 0x07 #define CMD_BATTERY_STATE 0x07
#define CMD_RUMBLE 0x39 #define CMD_RUMBLE 0x39
@@ -138,6 +140,11 @@ static void HIDAPI_DriverShield_SetDevicePlayerIndex(SDL_HIDAPI_Device *device,
static bool HIDAPI_DriverShield_SendCommand(SDL_HIDAPI_Device *device, Uint8 cmd, const void *data, int size) static bool HIDAPI_DriverShield_SendCommand(SDL_HIDAPI_Device *device, Uint8 cmd, const void *data, int size)
{ {
#ifdef SDL_PLATFORM_MACOS
// We hang for several seconds when trying to send output reports on macOS
return SDL_Unsupported();
#else
SDL_DriverShield_Context *ctx = (SDL_DriverShield_Context *)device->context; SDL_DriverShield_Context *ctx = (SDL_DriverShield_Context *)device->context;
ShieldCommandReport_t cmd_pkt; ShieldCommandReport_t cmd_pkt;
@@ -166,6 +173,8 @@ static bool HIDAPI_DriverShield_SendCommand(SDL_HIDAPI_Device *device, Uint8 cmd
} }
return true; return true;
#endif // MACOS
} }
static bool HIDAPI_DriverShield_OpenJoystick(SDL_HIDAPI_Device *device, SDL_Joystick *joystick) static bool HIDAPI_DriverShield_OpenJoystick(SDL_HIDAPI_Device *device, SDL_Joystick *joystick)