Mirrors_Framework/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2026-09-27 22:30:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a hang reading the Xbox report descriptor on macOS

Browse Source 
(cherry picked from commit 64998d2bc8)
This commit is contained in:
Sam Lantinga
2026-06-09 11:13:20 -07:00
parent 94ba53758f
commit 7cb03cfdc5
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/joystick/hidapi/SDL_hidapi_xboxone.c
+3
View File
@@ -404,6 +404,8 @@ static bool HIDAPI_DriverXboxOne_InitDevice(SDL_HIDAPI_Device *device)
device->context = ctx; device->context = ctx;
// The Xbox controller doesn't have real HID report descriptors, but Linux synthesizes them for us
#ifdef SDL_PLATFORM_LINUX
Uint8 descriptor[1024]; Uint8 descriptor[1024];
int descriptor_len = SDL_hid_get_report_descriptor(device->dev, descriptor, sizeof(descriptor)); int descriptor_len = SDL_hid_get_report_descriptor(device->dev, descriptor, sizeof(descriptor));
if (descriptor_len > 0) { if (descriptor_len > 0) {
@@ -453,6 +455,7 @@ static bool HIDAPI_DriverXboxOne_InitDevice(SDL_HIDAPI_Device *device)
} else { } else {
SDL_LogDebug(SDL_LOG_CATEGORY_INPUT, "Xbox report descriptor not available"); SDL_LogDebug(SDL_LOG_CATEGORY_INPUT, "Xbox report descriptor not available");
} }
#endif // SDL_PLATFORM_LINUX
ctx->vendor_id = device->vendor_id; ctx->vendor_id = device->vendor_id;
ctx->product_id = device->product_id; ctx->product_id = device->product_id;