Leahnaya/SDL
1
0
Fork 0
mirror of https://github.com/yawut/SDL.git synced 2026-10-02 05:06:46 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed bug #1080

Browse Source 
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.

--HG--
branch : SDL-1.2
This commit is contained in:
Sam Lantinga
2011-01-24 14:31:32 -08:00
parent af5e892e35
commit 2b8a7320bf
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/joystick/linux/SDL_sysjoystick.c
View File

@@ -700,26 +700,26 @@ static SDL_bool EV_ConfigJoystick(SDL_Joystick *joystick, int fd)
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 {