Attempt #3: Fixed boolean logic bug that caused all HID joysticks to be
authorRyan C. Gordon <icculus@icculus.org>
Thu, 22 May 2003 20:42:37 +0000
changeset 622e6d751de784a
parent 621 c3bb1270fa2b
child 623 477917048b91
Attempt #3: Fixed boolean logic bug that caused all HID joysticks to be
rejected on MacOSX/Darwin. Works now. No, really this time. --ryan.
src/joystick/darwin/SDL_sysjoystick.c
     1.1 --- a/src/joystick/darwin/SDL_sysjoystick.c	Thu May 22 07:12:36 2003 +0000
     1.2 +++ b/src/joystick/darwin/SDL_sysjoystick.c	Thu May 22 20:42:37 2003 +0000
     1.3 @@ -647,7 +647,7 @@
     1.4  
     1.5  		/* Filter device list to non-keyboard/mouse stuff */ 
     1.6  		if ( device->usagePage == kHIDPage_GenericDesktop &&
     1.7 -		     (device->usage != kHIDUsage_GD_Joystick ||
     1.8 +		     (device->usage != kHIDUsage_GD_Joystick &&
     1.9  		      device->usage != kHIDUsage_GD_GamePad)) {
    1.10  
    1.11  			/* release memory for the device */