gitea/SDL3_fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed build

Browse Source
This commit is contained in:
Sam Lantinga
2025-07-17 20:56:41 -07:00
parent e70ecb37c1
commit ad52ebf985
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -295,10 +295,10 @@ static void ProcessSDLFeaturesResponse(SDL_HIDAPI_Device *device, Uint8 *data)
} }
// Convert DPAD to hat // Convert DPAD to hat
const DPAD_MASK = (1 << SINPUT_BUTTON_IDX_DPAD_UP) | const int DPAD_MASK = (1 << SINPUT_BUTTON_IDX_DPAD_UP) |
(1 << SINPUT_BUTTON_IDX_DPAD_DOWN) | (1 << SINPUT_BUTTON_IDX_DPAD_DOWN) |
(1 << SINPUT_BUTTON_IDX_DPAD_LEFT) | (1 << SINPUT_BUTTON_IDX_DPAD_LEFT) |
(1 << SINPUT_BUTTON_IDX_DPAD_RIGHT); (1 << SINPUT_BUTTON_IDX_DPAD_RIGHT);
if ((ctx->usage_masks[0] & DPAD_MASK) == DPAD_MASK) { if ((ctx->usage_masks[0] & DPAD_MASK) == DPAD_MASK) {
ctx->dpad_supported = true; ctx->dpad_supported = true;
ctx->usage_masks[0] &= ~DPAD_MASK; ctx->usage_masks[0] &= ~DPAD_MASK;
@@ -711,7 +711,7 @@ static void HIDAPI_DriverSInput_HandleStatePacket(SDL_Joystick *joystick, SDL_Dr
if (ctx->last_state[SINPUT_REPORT_IDX_PLUG_STATUS] != data[SINPUT_REPORT_IDX_PLUG_STATUS] || if (ctx->last_state[SINPUT_REPORT_IDX_PLUG_STATUS] != data[SINPUT_REPORT_IDX_PLUG_STATUS] ||
ctx->last_state[SINPUT_REPORT_IDX_CHARGE_LEVEL] != data[SINPUT_REPORT_IDX_CHARGE_LEVEL]) { ctx->last_state[SINPUT_REPORT_IDX_CHARGE_LEVEL] != data[SINPUT_REPORT_IDX_CHARGE_LEVEL]) {
SDL_PowerState state = SDL_POWERSTATE_NO_BATTERY; SDL_PowerState state = SDL_POWERSTATE_UNKNOWN;
Uint8 status = data[SINPUT_REPORT_IDX_PLUG_STATUS]; Uint8 status = data[SINPUT_REPORT_IDX_PLUG_STATUS];
int percent = data[SINPUT_REPORT_IDX_CHARGE_LEVEL]; int percent = data[SINPUT_REPORT_IDX_CHARGE_LEVEL];
@@ -732,13 +732,11 @@ static void HIDAPI_DriverSInput_HandleStatePacket(SDL_Joystick *joystick, SDL_Dr
case 4: case 4:
state = SDL_POWERSTATE_ON_BATTERY; state = SDL_POWERSTATE_ON_BATTERY;
break; break;
default: // Wired/No Battery Supported default:
state = SDL_POWERSTATE_UNKNOWN;
percent = 0;
break; break;
} }
if (state > 0) { if (state != SDL_POWERSTATE_UNKNOWN) {
SDL_SendJoystickPowerInfo(joystick, state, percent); SDL_SendJoystickPowerInfo(joystick, state, percent);
} }
} }