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] SDL-1.2.14/src/joystick/linux/SDL_sysjoystick.c patch that is more memory efficient, along with allowing for better reading

libsdl-1.2.14-joystick.patch (text/plain), 1.83 KB, created by Gabriel Marcano on 2010-08-14 11:44:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Gabriel Marcano

Created: 2010-08-14 11:44:50 UTC

Size: 1.83 KB

patch

obsolete

>--- SDL-1.2.14/src/joystick/linux/SDL_sysjoystick.c	2009-10-18 13:54:40.000000000 -0400
>+++ SDL-1.2.14-mod/src/joystick/linux/SDL_sysjoystick.c	2010-08-14 14:35:20.000000000 -0400
>@@ -31,9 +31,7 @@
> #include <sys/ioctl.h>
> #include <limits.h>		/* For the definition of PATH_MAX */
> #include <linux/joystick.h>
>-#if SDL_INPUT_LINUXEV
>-#include <linux/input.h>
>-#endif
>+#include <linux/input.h> /* Needed to calculate sizeof(struct input_absinfo) */
> 
> #include "SDL_joystick.h"
> #include "../SDL_sysjoystick.h"
>@@ -700,26 +698,26 @@
> 				continue;
> 			}
> 			if ( test_bit(i, absbit) ) {
>-				int values[5];
>+				struct input_absinfo values;
> 
>-				if ( ioctl(fd, EVIOCGABS(i), values) < 0 )
>+				if ( ioctl(fd, EVIOCGABS(i), &values) < 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]);
>+					values.value, values.minimum,
>+					values.maximum, values.fuzz, values.flat);
> #endif /* DEBUG_INPUT_EVENTS */
> 				joystick->hwdata->abs_map[i] = joystick->naxes;
>-				if ( values[1] == values[2] ) {
>+				if ( values.minimum == values.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];
>+					(values.maximum + values.minimum) / 2 - values.flat;
> 				    joystick->hwdata->abs_correct[i].coef[1] =
>-					(values[2] + values[1]) / 2 + values[4];
>-				    t = ((values[2] - values[1]) / 2 - 2 * values[4]);
>+					(values.maximum + values.minimum) / 2 + values.flat;
>+				    t = ((values.maximum - values.minimum) / 2 - 2 * values.flat);
> 				    if ( t != 0 ) {
> 					joystick->hwdata->abs_correct[i].coef[2] = (1 << 29) / t;
> 				    } else {

Actions: View | Diff

Attachments on bug 1044: 530 | 531 | 532 | 534

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.