mirror of
git://slackware.nl/current.git
synced 2025-02-15 08:50:09 +01:00
75a4a592e5
Mon Apr 25 13:37:00 UTC 2011 Slackware 13.37 x86_64 stable is released! Thanks to everyone who pitched in on this release: the Slackware team, the folks producing upstream code, and linuxquestions.org for providing a great forum for collaboration and testing. The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a dual-sided 32-bit/64-bit x86/x86_64 DVD. Please consider supporting the Slackware project by picking up a copy from store.slackware.com. We're taking pre-orders now, and offer a discount if you sign up for a subscription. As always, thanks to the Slackware community for testing, suggestions, and feedback. :-) Have fun!
38 lines
1.5 KiB
Diff
38 lines
1.5 KiB
Diff
--- 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 {
|
|
|