encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ignore the PS4 packet CRC if it's not being set correctly 

This fixes handling the 8BitDo SN30 Pro with the 2.00 firmware in PS4 mode

Fixes https://github.com/libsdl-org/SDL/issues/7270

(cherry picked from commit 3951cae4a56fddcb42ce4141a6518c97fa9125cd)
(cherry picked from commit 57ae9f466db41e32c67c5a9a03c28f7803ac02c9)
This commit is contained in:
Sam Lantinga 2023-03-13 19:56:42 -07:00
parent 20e17559e5
commit 2fe5f3239c
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/joystick/hidapi/SDL_hidapi_ps4.c
View File

@ -150,6 +150,7 @@ typedef struct {
Uint8 led_blue; Uint8 led_blue;
Uint16 last_timestamp; Uint16 last_timestamp;
Uint64 timestamp; Uint64 timestamp;
Uint16 valid_crc_packets; /* wrapping counter */
PS4StatePacket_t last_state; PS4StatePacket_t last_state;
} SDL_DriverPS4_Context; } SDL_DriverPS4_Context;
@ -1046,7 +1047,18 @@ HIDAPI_DriverPS4_IsPacketValid(SDL_DriverPS4_Context *ctx, Uint8 *data, int size
case k_EPS4ReportIdBluetoothState8: case k_EPS4ReportIdBluetoothState8:
case k_EPS4ReportIdBluetoothState9: case k_EPS4ReportIdBluetoothState9:
/* Bluetooth state packets have two additional bytes at the beginning, the first notes if HID data is present */ /* Bluetooth state packets have two additional bytes at the beginning, the first notes if HID data is present */
if (size >= 78 && (data[1] & 0x80) && VerifyCRC(data, 78)) { if (size >= 78 && (data[1] & 0x80)) {
if (VerifyCRC(data, 78)) {
++ctx->valid_crc_packets;
} else {
if (ctx->valid_crc_packets > 0) {
--ctx->valid_crc_packets;
}
if (ctx->valid_crc_packets >= 3) {
/* We're generally getting valid CRC, but failed one */
return SDL_FALSE;
}
}
return SDL_TRUE; return SDL_TRUE;
} }
break; break;