From 3f6c4ec6d01b3b05c55280f7d73f2231285a9ba8 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Tue, 13 Jun 2023 16:49:33 -0700 Subject: [PATCH] Cleanup for previous change, fixing typos, etc. (cherry picked from commit 883b0f4071687f2e5c8329963f97504e9679394b) --- src/joystick/linux/SDL_sysjoystick.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/joystick/linux/SDL_sysjoystick.c b/src/joystick/linux/SDL_sysjoystick.c index 99803b2437..e6db86781b 100644 --- a/src/joystick/linux/SDL_sysjoystick.c +++ b/src/joystick/linux/SDL_sysjoystick.c @@ -2148,7 +2148,7 @@ static SDL_bool LINUX_JoystickGetGamepadMapping(int device_index, SDL_GamepadMap } if (SDL_JoystickGetVendor(joystick) == USB_VENDOR_MICROSOFT) { - /* The Xbox Elite controllers have the paddles as BTN_TRIGGER_HAPPY4 - BTN_TRIGGER_HAPPY7 */ + /* The Xbox Elite controllers have the paddles as BTN_TRIGGER_HAPPY5 - BTN_TRIGGER_HAPPY8 */ if (joystick->hwdata->has_key[BTN_TRIGGER_HAPPY5] && joystick->hwdata->has_key[BTN_TRIGGER_HAPPY6] && joystick->hwdata->has_key[BTN_TRIGGER_HAPPY7] && @@ -2162,10 +2162,10 @@ static SDL_bool LINUX_JoystickGetGamepadMapping(int device_index, SDL_GamepadMap out->paddle4.kind = EMappingKind_Button; out->paddle4.target = joystick->hwdata->key_map[BTN_TRIGGER_HAPPY8]; #ifdef DEBUG_GAMEPAD_MAPPING - SDL_Log("Mapped PADDLE1 to button %d (BTN_TRIGGER_HAPPY4)", out->paddle1.target); - SDL_Log("Mapped PADDLE2 to button %d (BTN_TRIGGER_HAPPY6)", out->paddle2.target); - SDL_Log("Mapped PADDLE3 to button %d (BTN_TRIGGER_HAPPY5)", out->paddle3.target); - SDL_Log("Mapped PADDLE4 to button %d (BTN_TRIGGER_HAPPY7)", out->paddle4.target); + SDL_Log("Mapped PADDLE1 to button %d (BTN_TRIGGER_HAPPY5)", out->paddle1.target); + SDL_Log("Mapped PADDLE2 to button %d (BTN_TRIGGER_HAPPY7)", out->paddle2.target); + SDL_Log("Mapped PADDLE3 to button %d (BTN_TRIGGER_HAPPY6)", out->paddle3.target); + SDL_Log("Mapped PADDLE4 to button %d (BTN_TRIGGER_HAPPY8)", out->paddle4.target); #endif } @@ -2173,7 +2173,6 @@ static SDL_bool LINUX_JoystickGetGamepadMapping(int device_index, SDL_GamepadMap if (joystick->hwdata->has_key[KEY_RECORD]) { out->misc1.kind = EMappingKind_Button; out->misc1.target = joystick->hwdata->key_map[KEY_RECORD]; - mapped |= MAPPED_DPAD_RIGHT; #ifdef DEBUG_GAMEPAD_MAPPING SDL_Log("Mapped MISC1 to button %d (KEY_RECORD)", out->misc1.target); #endif