Fixed bug #1080 SDL-1.2
authorSam Lantinga <slouken@libsdl.org>
Mon, 24 Jan 2011 14:31:32 -0800
branchSDL-1.2
changeset 5082 4c3c2599559b
parent 5077 8c88cae7911e
child 5083 f521f8739611
Fixed bug #1080 Markus Rathgeb 2011-01-23 14:34:23 PST With kernel 2.6.31 the struct input_absinfo defined in linux/input.h changed. A field "__s32 resolution" was added at the end of the struct. Because the macro EVIOCGABS(abs) is using the struct input_absinfo, it would be better (IMHO) to change the declaration of variable values to "int values[sizeof(struct input_absinfo) / sizeof(int)];" or using "struct input_absinfo" directly.
src/joystick/linux/SDL_sysjoystick.c
--- a/src/joystick/linux/SDL_sysjoystick.c	Sun Jan 23 21:02:02 2011 -0800
+++ b/src/joystick/linux/SDL_sysjoystick.c	Mon Jan 24 14:31:32 2011 -0800
@@ -700,26 +700,26 @@
 				continue;
 			}
 			if ( test_bit(i, absbit) ) {
-				int values[6];
+				struct input_absinfo absinfo;
 
-				if ( ioctl(fd, EVIOCGABS(i), values) < 0 )
+				if ( ioctl(fd, EVIOCGABS(i), &absinfo) < 0 )
 					continue;
 #ifdef DEBUG_INPUT_EVENTS
 				printf("Joystick has absolute axis: %x\n", i);
 				printf("Values = { %d, %d, %d, %d, %d }\n",
-					values[0], values[1],
-					values[2], values[3], values[4]);
+					absinfo.value, absinfo.minimum,
+					absinfo.maximum, absinfo.fuzz, absinfo.flat);
 #endif /* DEBUG_INPUT_EVENTS */
 				joystick->hwdata->abs_map[i] = joystick->naxes;
-				if ( values[1] == values[2] ) {
+				if ( absinfo.minimum == absinfo.maximum ) {
 				    joystick->hwdata->abs_correct[i].used = 0;
 				} else {
 				    joystick->hwdata->abs_correct[i].used = 1;
 				    joystick->hwdata->abs_correct[i].coef[0] =
-					(values[2] + values[1]) / 2 - values[4];
+					(absinfo.maximum + absinfo.minimum) / 2 - values[4];
 				    joystick->hwdata->abs_correct[i].coef[1] =
-					(values[2] + values[1]) / 2 + values[4];
-				    t = ((values[2] - values[1]) / 2 - 2 * values[4]);
+					(absinfo.maximum + absinfo.minimum) / 2 + values[4];
+				    t = ((absinfo.maximum - absinfo.minimum) / 2 - 2 * values[4]);
 				    if ( t != 0 ) {
 					joystick->hwdata->abs_correct[i].coef[2] = (1 << 29) / t;
 				    } else {