mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-10-05 17:36:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improved detection of Nintendo Switch Pro controller report mode

Browse Source 
Fixes https://github.com/libsdl-org/SDL/issues/10182
This commit is contained in:
Sam Lantinga
2024-07-06 05:29:12 -07:00
parent 6d64d821fb
commit 4ba2e9f4f4
1 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/joystick/hidapi/SDL_hidapi_switch.c
View File

@@ -337,12 +337,28 @@ typedef struct
static int ReadInput(SDL_DriverSwitch_Context *ctx) static int ReadInput(SDL_DriverSwitch_Context *ctx)
{ {
int result;
/* Make sure we don't try to read at the same time a write is happening */ /* Make sure we don't try to read at the same time a write is happening */
if (SDL_AtomicGet(&ctx->device->rumble_pending) > 0) { if (SDL_AtomicGet(&ctx->device->rumble_pending) > 0) {
return 0; return 0;
} }
return SDL_hid_read_timeout(ctx->device->dev, ctx->m_rgucReadBuffer, sizeof(ctx->m_rgucReadBuffer), 0); result = SDL_hid_read_timeout(ctx->device->dev, ctx->m_rgucReadBuffer, sizeof(ctx->m_rgucReadBuffer), 0);
/* See if we can guess the initial input mode */
if (result > 0 && !ctx->m_bInputOnly && !ctx->m_nInitialInputMode) {
switch (ctx->m_rgucReadBuffer[0]) {
case k_eSwitchInputReportIDs_FullControllerState:
case k_eSwitchInputReportIDs_FullControllerAndMcuState:
case k_eSwitchInputReportIDs_SimpleControllerState:
ctx->m_nInitialInputMode = ctx->m_rgucReadBuffer[0];
break;
default:
break;
}
}
return result;
} }
static int WriteOutput(SDL_DriverSwitch_Context *ctx, const Uint8 *data, int size) static int WriteOutput(SDL_DriverSwitch_Context *ctx, const Uint8 *data, int size)
@@ -738,14 +754,12 @@ static void SDLCALL SDL_PlayerLEDHintChanged(void *userdata, const char *name, c
} }
} }
static Uint8 GetInitialInputMode(SDL_DriverSwitch_Context *ctx) static void GetInitialInputMode(SDL_DriverSwitch_Context *ctx)
{ {
Uint8 input_mode = 0; if (!ctx->m_nInitialInputMode) {
/* This will set the initial input mode if it can */
if (ReadInput(ctx) > 0) { ReadInput(ctx);
input_mode = ctx->m_rgucReadBuffer[0];
} }
return input_mode;
} }
static Uint8 GetDefaultInputMode(SDL_DriverSwitch_Context *ctx) static Uint8 GetDefaultInputMode(SDL_DriverSwitch_Context *ctx)
@@ -1391,7 +1405,7 @@ static SDL_bool HIDAPI_DriverSwitch_OpenJoystick(SDL_HIDAPI_Device *device, SDL_
ctx->m_bSyncWrite = SDL_TRUE; ctx->m_bSyncWrite = SDL_TRUE;
if (!ctx->m_bInputOnly) { if (!ctx->m_bInputOnly) {
ctx->m_nInitialInputMode = GetInitialInputMode(ctx); GetInitialInputMode(ctx);
ctx->m_nCurrentInputMode = ctx->m_nInitialInputMode; ctx->m_nCurrentInputMode = ctx->m_nInitialInputMode;
/* Initialize rumble data */ /* Initialize rumble data */