Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
If we're looking at the /dev/input event devices, and we found
at least one, then we don't want to look at the input joystick
devices, since they're built on top of devices that we've already
seen, so we're done.
  • Loading branch information
slouken committed Oct 22, 2001
1 parent 01b66bb commit 88a9476
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 4 deletions.
4 changes: 2 additions & 2 deletions configure.in
Expand Up @@ -930,8 +930,8 @@ CheckInputEvents()
{
dnl Check for Linux 2.4 unified input event interface support
AC_ARG_ENABLE(input-events,
[ --enable-input-events use Linux 2.4 unified input interface [default=no]],
, enable_input_events=no)
[ --enable-input-events use Linux 2.4 unified input interface [default=yes]],
, enable_input_events=yes)
if test x$enable_input_events = xyes; then
AC_MSG_CHECKING(for Linux 2.4 unified input interface)
use_input_events=no
Expand Down
12 changes: 10 additions & 2 deletions src/joystick/linux/SDL_sysjoystick.c
Expand Up @@ -143,9 +143,8 @@ int SDL_SYS_JoystickInit(void)
"/dev/js%d",
#ifdef USE_INPUT_EVENTS
"/dev/input/event%d"
#else
"/dev/input/js%d"
#endif
"/dev/input/js%d"
};
int numjoysticks;
int i, j, done;
Expand Down Expand Up @@ -222,6 +221,15 @@ int SDL_SYS_JoystickInit(void)
done = 1;
}
}
/* This is a special case...
If we're looking at the /dev/input event devices, and we found
at least one, then we don't want to look at the input joystick
devices, since they're built on top of devices that we've already
seen, so we're done.
*/
if ( i > 0 && j > 0 ) {
done = 1;
}
}
return(numjoysticks);
}
Expand Down

0 comments on commit 88a9476

Please sign in to comment.