changeset 3079:cfc8b35ad6b1

Fixed haptic subsystem on linux 2.6.28 by lowering the EV_IsJoystick check (seems like some stuff was changed). Shouldn't break anything with earlier versions. Might need to be more robust if false positives show up.
author Edgar Simo <bobbens@gmail.com>
date Sat, 21 Feb 2009 18:02:55 +0000
parents 81d15ace9129
children 4094b4f1c3a1
files src/joystick/linux/SDL_sysjoystick.c
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/joystick/linux/SDL_sysjoystick.c	Thu Feb 19 06:49:59 2009 +0000
+++ b/src/joystick/linux/SDL_sysjoystick.c	Sat Feb 21 18:02:55 2009 +0000
@@ -377,11 +377,11 @@
         (ioctl(fd, EVIOCGBIT(EV_ABS, sizeof(absbit)), absbit) < 0)) {
         return (0);
     }
+
     if (!(test_bit(EV_KEY, evbit) && test_bit(EV_ABS, evbit) &&
-          test_bit(ABS_X, absbit) && test_bit(ABS_Y, absbit) &&
-          (test_bit(BTN_TRIGGER, keybit) || test_bit(BTN_A, keybit)
-           || test_bit(BTN_1, keybit))))
+          test_bit(ABS_X, absbit) && test_bit(ABS_Y, absbit))) {
         return 0;
+    }
     return (1);
 }