We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Use struct input_absinfo

libsdl-1.2.14-opt2.patch (text/plain), 1.54 KB, created by Markus Rathgeb on 2011-01-23 14:37:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Markus Rathgeb

Created: 2011-01-23 14:37:21 UTC

Size: 1.54 KB

patch

obsolete

>--- SDL-1.2.14/src/joystick/linux/SDL_sysjoystick.c.org	2011-01-23 23:23:31.865198998 +0100
>+++ SDL-1.2.14/src/joystick/linux/SDL_sysjoystick.c	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 {

Actions: View | Diff

Attachments on bug 1080: 557 | 558

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.