Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

Merged r2992:2993 from branches/SDL-1.2: Mac OS X multi-axis joystick…

… support.
  • Loading branch information
icculus committed Mar 18, 2007
1 parent 9a7ba9d commit ecc703d708acde7fbb8bda418d09ef42b1cab4b4
Showing with 4 additions and 3 deletions.
  1. +4 −3 src/joystick/darwin/SDL_sysjoystick.c
@@ -690,9 +690,10 @@ SDL_SYS_JoystickInit(void)
*/

/* Filter device list to non-keyboard/mouse stuff */
if ((device->usagePage != kHIDPage_GenericDesktop) ||
((device->usage != kHIDUsage_GD_Joystick &&
device->usage != kHIDUsage_GD_GamePad))) {
if ( (device->usagePage != kHIDPage_GenericDesktop) ||
((device->usage != kHIDUsage_GD_Joystick &&
device->usage != kHIDUsage_GD_GamePad &&
device->usage != kHIDUsage_GD_MultiAxisController)) ) {

/* release memory for the device */
HIDDisposeDevice(&device);

0 comments on commit ecc703d

Please sign in to comment.