Mercurial > sdl-ios-xcode
diff src/joystick/darwin/SDL_sysjoystick.c @ 2097:b0048df1701a
Merged r2992:2993 from branches/SDL-1.2: Mac OS X multi-axis joystick support.
| author | Ryan C. Gordon <icculus@icculus.org> |
|---|---|
| date | Sun, 18 Mar 2007 22:39:24 +0000 |
| parents | c121d94672cb |
| children | 51cbe188a49e |
line wrap: on
line diff
--- a/src/joystick/darwin/SDL_sysjoystick.c Wed Mar 14 01:10:43 2007 +0000 +++ b/src/joystick/darwin/SDL_sysjoystick.c Sun Mar 18 22:39:24 2007 +0000 @@ -690,9 +690,10 @@ */ /* 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);