From 561b81add31a050f6f90c110c7fcd17f1f4b868f Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Sat, 6 Mar 2004 02:58:06 +0000 Subject: [PATCH] Date: Fri, 05 Mar 2004 16:08:01 +0000 From: Alan Swanson Subject: Re: [SDL] Fatal signal when initiaize with USB joystick on 2.6.2 kern On Fri, 2004-03-05 at 15:09, Sam Lantinga wrote: > > Fred, how does the attached patch work for you? Do all your axes work? > > I think you meant the two lines to be reversed. > I checked a more robust version of this into CVS. Fred, can you see if > it works? You've misread the code. :-/ For coef[0] and coef[1], it is (values[2]+values[1]) / 2 and then add or subtract values[4] to the answer. --HG-- extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%40873 --- src/joystick/linux/SDL_sysjoystick.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/joystick/linux/SDL_sysjoystick.c b/src/joystick/linux/SDL_sysjoystick.c index d4247bd8f..21ef1bd06 100644 --- a/src/joystick/linux/SDL_sysjoystick.c +++ b/src/joystick/linux/SDL_sysjoystick.c @@ -436,17 +436,15 @@ static SDL_bool EV_ConfigJoystick(SDL_Joystick *joystick, int fd) joystick->hwdata->abs_correct[i].used = 0; } else { joystick->hwdata->abs_correct[i].used = 1; - t = (2 - values[4]); - if ( t != 0 ) { - joystick->hwdata->abs_correct[i].coef[0] = (values[2] + values[1]) / t; - } - t = (2 + values[4]); - if ( t != 0 ) { - joystick->hwdata->abs_correct[i].coef[1] = (values[2] + values[1]) / t; - } + joystick->hwdata->abs_correct[i].coef[0] = + (values[2] + values[1]) / 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]); if ( t != 0 ) { joystick->hwdata->abs_correct[i].coef[2] = (1 << 29) / t; + } else { + joystick->hwdata->abs_correct[i].coef[2] = 0; } } ++joystick->naxes;