eden-emu/SDL
15
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed Nintendo Switch Pro controllers that don't have readable user calibration

Browse source
This commit is contained in:
Sam Lantinga 2023-06-27 07:48:42 -07:00
parent c065a9b128
commit 9ee1200e6f
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/joystick/hidapi/SDL_hidapi_switch.c
View file

@ -755,9 +755,8 @@ static SDL_bool LoadStickCalibration(SDL_DriverSwitch_Context *ctx)
readUserParams.unAddress = k_unSPIStickUserCalibrationStartOffset; readUserParams.unAddress = k_unSPIStickUserCalibrationStartOffset;
readUserParams.ucLength = k_unSPIStickUserCalibrationLength; readUserParams.ucLength = k_unSPIStickUserCalibrationLength;
if (!WriteSubcommand(ctx, k_eSwitchSubcommandIDs_SPIFlashRead, (uint8_t *)&readUserParams, sizeof(readUserParams), &user_reply)) { /* This isn't readable on all controllers, so ignore failure */
return SDL_FALSE; WriteSubcommand(ctx, k_eSwitchSubcommandIDs_SPIFlashRead, (uint8_t *)&readUserParams, sizeof(readUserParams), &user_reply);
}
/* Read Factory Calibration Info */ /* Read Factory Calibration Info */
readFactoryParams.unAddress = k_unSPIStickFactoryCalibrationStartOffset; readFactoryParams.unAddress = k_unSPIStickFactoryCalibrationStartOffset;
@ -768,13 +767,13 @@ static SDL_bool LoadStickCalibration(SDL_DriverSwitch_Context *ctx)
} }
/* Automatically select the user calibration if magic bytes are set */ /* Automatically select the user calibration if magic bytes are set */
if (user_reply->stickUserCalibration.rgucLeftMagic[0] == 0xB2 && user_reply->stickUserCalibration.rgucLeftMagic[1] == 0xA1) { if (user_reply && user_reply->stickUserCalibration.rgucLeftMagic[0] == 0xB2 && user_reply->stickUserCalibration.rgucLeftMagic[1] == 0xA1) {
pLeftStickCal = user_reply->stickUserCalibration.rgucLeftCalibration; pLeftStickCal = user_reply->stickUserCalibration.rgucLeftCalibration;
} else { } else {
pLeftStickCal = factory_reply->stickFactoryCalibration.rgucLeftCalibration; pLeftStickCal = factory_reply->stickFactoryCalibration.rgucLeftCalibration;
} }
if (user_reply->stickUserCalibration.rgucRightMagic[0] == 0xB2 && user_reply->stickUserCalibration.rgucRightMagic[1] == 0xA1) { if (user_reply && user_reply->stickUserCalibration.rgucRightMagic[0] == 0xB2 && user_reply->stickUserCalibration.rgucRightMagic[1] == 0xA1) {
pRightStickCal = user_reply->stickUserCalibration.rgucRightCalibration; pRightStickCal = user_reply->stickUserCalibration.rgucRightCalibration;
} else { } else {
pRightStickCal = factory_reply->stickFactoryCalibration.rgucRightCalibration; pRightStickCal = factory_reply->stickFactoryCalibration.rgucRightCalibration;