commit afa9ecdc2167cd1020f4546d72d3e1af62f1c6d1
author Sam Lantinga <slouken@libsdl.org> Fri Jan 08 09:54:52 2021 -0800
committer Sam Lantinga <slouken@libsdl.org> Fri Jan 08 09:54:52 2021 -0800
tree c647a2f1a5402c1e4c95db4433065b4184903a68
parent 85d224cd0556889e584b040af7a4a7e39c01b097

Fixed Xbox One Series X share button incorrectly triggering on newer firmware

build-scripts/config.guess

diff --git a/build-scripts/config.guess b/build-scripts/config.guess
old mode 100755
new mode 100644

build-scripts/config.sub

diff --git a/build-scripts/config.sub b/build-scripts/config.sub
old mode 100755
new mode 100644

src/joystick/hidapi/SDL_hidapi_xboxone.c

diff --git a/src/joystick/hidapi/SDL_hidapi_xboxone.c b/src/joystick/hidapi/SDL_hidapi_xboxone.c
index 22a89c2..0b467df 100644
--- a/src/joystick/hidapi/SDL_hidapi_xboxone.c
+++ b/src/joystick/hidapi/SDL_hidapi_xboxone.c
@@ -488,14 +488,18 @@
     }
 
     if (ctx->has_share_button) {
-        /* Version 1 of the firmware for Xbox One Series X */
-        if (ctx->last_state[18] != data[18]) {
-            SDL_PrivateJoystickButton(joystick, SDL_CONTROLLER_BUTTON_MISC1, (data[18] & 0x01) ? SDL_PRESSED : SDL_RELEASED);
-        }
-
-        /* Version 2 of the firmware for Xbox One Series X */
-        if (ctx->last_state[22] != data[22]) {
-            SDL_PrivateJoystickButton(joystick, SDL_CONTROLLER_BUTTON_MISC1, (data[22] & 0x01) ? SDL_PRESSED : SDL_RELEASED);
+        /* Xbox Series X firmware version 5.0, report is 36 bytes, share button is in byte 18
+         * Xbox Series X firmware version 5.1, report is 44 bytes, share button is in byte 18
+         * Xbox Series X firmware version 5.5, report is 48 bytes, share button is in byte 22
+         */
+        if (size < 48) {
+            if (ctx->last_state[18] != data[18]) {
+                SDL_PrivateJoystickButton(joystick, SDL_CONTROLLER_BUTTON_MISC1, (data[18] & 0x01) ? SDL_PRESSED : SDL_RELEASED);
+            }
+        } else {
+            if (ctx->last_state[22] != data[22]) {
+                SDL_PrivateJoystickButton(joystick, SDL_CONTROLLER_BUTTON_MISC1, (data[22] & 0x01) ? SDL_PRESSED : SDL_RELEASED);
+            }
         }
     }