summaryrefslogtreecommitdiffstats
path: root/source/l/sdl/sdl.linux-2.6.31.input_absinfo.diff
diff options
context:
space:
mode:
Diffstat (limited to 'source/l/sdl/sdl.linux-2.6.31.input_absinfo.diff')
-rw-r--r--source/l/sdl/sdl.linux-2.6.31.input_absinfo.diff38
1 files changed, 0 insertions, 38 deletions
diff --git a/source/l/sdl/sdl.linux-2.6.31.input_absinfo.diff b/source/l/sdl/sdl.linux-2.6.31.input_absinfo.diff
deleted file mode 100644
index 685007ab7..000000000
--- a/source/l/sdl/sdl.linux-2.6.31.input_absinfo.diff
+++ /dev/null
@@ -1,38 +0,0 @@
---- SDL-1.2.14/src/joystick/linux/SDL_sysjoystick.c 2011-01-23 23:23:31.865198998 +0100
-+++ SDL-1.2.14/src/joystick/linux/SDL_sysjoystick.c.org 2011-01-23 23:28:12.427198998 +0100
-@@ -700,26 +700,26 @@
- continue;
- }
- if ( test_bit(i, absbit) ) {
-- int values[5];
-+ 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 - absinfo.flat;
- 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 + absinfo.flat;
-+ t = ((absinfo.maximum - absinfo.minimum) / 2 - 2 * absinfo.flat);
- if ( t != 0 ) {
- joystick->hwdata->abs_correct[i].coef[2] = (1 << 29) / t;
- } else {
-