Revert "Linux joystick: Look at entire axis namespace for controls (t…

…hanks, "spaz16"!)." This reverts commit 4cb7923. see RetroPie/RetroPie-Setup#1297
spurious · Nov 18, 2016 · b02fe99 · b02fe99
1 parent b66155e
commit b02fe99
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/joystick/linux/SDL_sysjoystick.c b/src/joystick/linux/SDL_sysjoystick.c
@@ -459,7 +459,7 @@ ConfigJoystick(SDL_Joystick * joystick, int fd)
                 ++joystick->nbuttons;
             }
         }
-        for (i = 0; i < ABS_MAX; ++i) {
+        for (i = 0; i < ABS_MISC; ++i) {
             /* Skip hats */
             if (i == ABS_HAT0X) {
                 i = ABS_HAT3Y;
@@ -720,6 +720,10 @@ HandleInputEvents(SDL_Joystick * joystick)
                 }
                 break;
             case EV_ABS:
+                if (code >= ABS_MISC) {
+                    break;
+                }
+
                 switch (code) {
                 case ABS_HAT0X:
                 case ABS_HAT0Y: