Mercurial > sdl-ios-xcode

comparison src/joystick/darwin/SDL_sysjoystick.c @ 2097:b0048df1701a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
2096:87256df87837 2097:b0048df1701a
688 /* if (KERN_SUCCESS != result) 688 /* if (KERN_SUCCESS != result)
689 HIDReportErrorNum ("IOObjectRelease error with ioHIDDeviceObject.", result); 689 HIDReportErrorNum ("IOObjectRelease error with ioHIDDeviceObject.", result);
690 */ 690 */
691 691
692 /* Filter device list to non-keyboard/mouse stuff */ 692 /* Filter device list to non-keyboard/mouse stuff */
693 if ((device->usagePage != kHIDPage_GenericDesktop) || 693 if ( (device->usagePage != kHIDPage_GenericDesktop) ||
694 ((device->usage != kHIDUsage_GD_Joystick && 694 ((device->usage != kHIDUsage_GD_Joystick &&
695 device->usage != kHIDUsage_GD_GamePad))) { 695 device->usage != kHIDUsage_GD_GamePad &&
696 device->usage != kHIDUsage_GD_MultiAxisController)) ) {
696 697
697 /* release memory for the device */ 698 /* release memory for the device */
698 HIDDisposeDevice(&device); 699 HIDDisposeDevice(&device);
699 DisposePtr((Ptr) device); 700 DisposePtr((Ptr) device);
700 continue; 701 continue;