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

Validate SPI read command in the Nintendo Switch HIDAPI driver

Browse Source
This commit is contained in:
Sam Lantinga
2025-11-05 17:34:22 -08:00
parent 9a1745f2c8
commit c94da8977d
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -393,7 +393,7 @@ static int WriteOutput(SDL_DriverSwitch_Context *ctx, const Uint8 *data, int siz
#endif // SWITCH_SYNCHRONOUS_WRITES #endif // SWITCH_SYNCHRONOUS_WRITES
} }
static SwitchSubcommandInputPacket_t *ReadSubcommandReply(SDL_DriverSwitch_Context *ctx, ESwitchSubcommandIDs expectedID) static SwitchSubcommandInputPacket_t *ReadSubcommandReply(SDL_DriverSwitch_Context *ctx, ESwitchSubcommandIDs expectedID, const Uint8 *pBuf, Uint8 ucLen)
{ {
// Average response time for messages is ~30ms // Average response time for messages is ~30ms
Uint64 endTicks = SDL_GetTicks() + 100; Uint64 endTicks = SDL_GetTicks() + 100;
@@ -403,9 +403,17 @@ static SwitchSubcommandInputPacket_t *ReadSubcommandReply(SDL_DriverSwitch_Conte
if (nRead > 0) { if (nRead > 0) {
if (ctx->m_rgucReadBuffer[0] == k_eSwitchInputReportIDs_SubcommandReply) { if (ctx->m_rgucReadBuffer[0] == k_eSwitchInputReportIDs_SubcommandReply) {
SwitchSubcommandInputPacket_t *reply = (SwitchSubcommandInputPacket_t *)&ctx->m_rgucReadBuffer[1]; SwitchSubcommandInputPacket_t *reply = (SwitchSubcommandInputPacket_t *)&ctx->m_rgucReadBuffer[1];
if (reply->ucSubcommandID == expectedID && (reply->ucSubcommandAck & 0x80)) { if (reply->ucSubcommandID != expectedID || !(reply->ucSubcommandAck & 0x80)) {
return reply; continue;
} }
if (reply->ucSubcommandID == k_eSwitchSubcommandIDs_SPIFlashRead) {
SDL_assert(ucLen == sizeof(reply->spiReadData.opData));
if (SDL_memcmp(&reply->spiReadData.opData, pBuf, ucLen) != 0) {
// This was a reply for another SPI read command
continue;
}
}
return reply;
} }
} else { } else {
SDL_Delay(1); SDL_Delay(1);
@@ -492,7 +500,7 @@ static bool WriteSubcommand(SDL_DriverSwitch_Context *ctx, ESwitchSubcommandIDs
continue; continue;
} }
reply = ReadSubcommandReply(ctx, ucCommandID); reply = ReadSubcommandReply(ctx, ucCommandID, pBuf, ucLen);
} }
if (ppReply) { if (ppReply) {