Merged r2992:2993 from branches/SDL-1.2: Mac OS X multi-axis joystick support.
authorRyan C. Gordon <icculus@icculus.org>
Sun, 18 Mar 2007 22:39:24 +0000
changeset 2097b0048df1701a
parent 2096 87256df87837
child 2098 e554a6547303
Merged r2992:2993 from branches/SDL-1.2: Mac OS X multi-axis joystick support.
src/joystick/darwin/SDL_sysjoystick.c
     1.1 --- a/src/joystick/darwin/SDL_sysjoystick.c	Wed Mar 14 01:10:43 2007 +0000
     1.2 +++ b/src/joystick/darwin/SDL_sysjoystick.c	Sun Mar 18 22:39:24 2007 +0000
     1.3 @@ -690,9 +690,10 @@
     1.4  */
     1.5  
     1.6          /* Filter device list to non-keyboard/mouse stuff */
     1.7 -        if ((device->usagePage != kHIDPage_GenericDesktop) ||
     1.8 -            ((device->usage != kHIDUsage_GD_Joystick &&
     1.9 -              device->usage != kHIDUsage_GD_GamePad))) {
    1.10 +        if ( (device->usagePage != kHIDPage_GenericDesktop) ||
    1.11 +             ((device->usage != kHIDUsage_GD_Joystick &&
    1.12 +               device->usage != kHIDUsage_GD_GamePad &&
    1.13 +               device->usage != kHIDUsage_GD_MultiAxisController)) ) {
    1.14  
    1.15              /* release memory for the device */
    1.16              HIDDisposeDevice(&device);