From 49b9e97e79d676837b3fc874dea8ef0c9e4aae0f Mon Sep 17 00:00:00 2001
From: "Ryan C. Gordon" <icculus@icculus.org>
Date: Sun, 18 Mar 2007 22:39:24 +0000
Subject: [PATCH] Merged r2992:2993 from branches/SDL-1.2: Mac OS X multi-axis
joystick support.
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402285
---
src/joystick/darwin/SDL_sysjoystick.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/joystick/darwin/SDL_sysjoystick.c b/src/joystick/darwin/SDL_sysjoystick.c
index 42f90d52..9ff49842 100644
--- a/src/joystick/darwin/SDL_sysjoystick.c
+++ b/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);
--
2.18.1