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

SDL_hidapi_wii.c: fix build in c89 mode.

This commit is contained in:
Ozkan Sezer 2022-09-02 18:55:00 +03:00
parent 9874fc4e6a
commit 0c24b46e9f
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/joystick/hidapi/SDL_hidapi_wii.c
View File

@ -811,13 +811,14 @@ static void HandleWiiUProButtonData(SDL_DriverWii_Context *ctx, SDL_Joystick *jo
static const Uint8 axes[] = { SDL_CONTROLLER_AXIS_LEFTX, SDL_CONTROLLER_AXIS_RIGHTX, SDL_CONTROLLER_AXIS_LEFTY, SDL_CONTROLLER_AXIS_RIGHTY }; static const Uint8 axes[] = { SDL_CONTROLLER_AXIS_LEFTX, SDL_CONTROLLER_AXIS_RIGHTX, SDL_CONTROLLER_AXIS_LEFTY, SDL_CONTROLLER_AXIS_RIGHTY };
const Uint8 (*buttons)[8] = ctx->m_bUseButtonLabels ? WUP_CLASSIC_BUTTON_DEFS : WUP_CLASSIC_BUTTON_DEFS_POSITIONAL; const Uint8 (*buttons)[8] = ctx->m_bUseButtonLabels ? WUP_CLASSIC_BUTTON_DEFS : WUP_CLASSIC_BUTTON_DEFS_POSITIONAL;
Uint8 zl, zr; Uint8 zl, zr;
int i;
if (data->ucNExtensionBytes < 11) { if (data->ucNExtensionBytes < 11) {
return; return;
} }
/* Sticks */ /* Sticks */
for (int i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
Uint16 value = data->rgucExtension[i * 2] | (data->rgucExtension[i * 2 + 1] << 8); Uint16 value = data->rgucExtension[i * 2] | (data->rgucExtension[i * 2 + 1] << 8);
PostStickCalibrated(joystick, &ctx->m_StickCalibrationData[i], axes[i], value); PostStickCalibrated(joystick, &ctx->m_StickCalibrationData[i], axes[i], value);
} }
@ -1049,7 +1050,8 @@ static void HandleResponse(SDL_DriverWii_Context *ctx, SDL_Joystick *joystick)
char str[48]; char str[48];
Uint32 strpos = 0; Uint32 strpos = 0;
Uint32 len = (ctx->m_rgucReadBuffer[3] >> 4) + 1; Uint32 len = (ctx->m_rgucReadBuffer[3] >> 4) + 1;
for (Uint32 i = 0; i < len; i++) { Uint32 i;
for (i = 0; i < len; i++) {
str[strpos++] = hextable[ctx->m_rgucReadBuffer[6 + i] >> 4]; str[strpos++] = hextable[ctx->m_rgucReadBuffer[6 + i] >> 4];
str[strpos++] = hextable[ctx->m_rgucReadBuffer[6 + i] & 0xF]; str[strpos++] = hextable[ctx->m_rgucReadBuffer[6 + i] & 0xF];
str[strpos++] = ' '; str[strpos++] = ' ';