David Lawrie : winejoystick.drv/joystick_osx.c: Adds multi-axis controller.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: e06bbf0d54fcddc952d079e1f645da65bbb22746
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=e06bbf0d54fcddc952d079e1f6...

Author: David Lawrie <david.dljunk(a)gmail.com>
Date:   Sun Jun 12 22:11:19 2016 -0700

winejoystick.drv/joystick_osx.c: Adds multi-axis controller.

Signed-off-by: David Lawrie <david.dljunk(a)gmail.com>
Signed-off-by: Ken Thomases <ken(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/winejoystick.drv/joystick_osx.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/winejoystick.drv/joystick_osx.c b/dlls/winejoystick.drv/joystick_osx.c
index 48c05a0..a58c9cf 100644
--- a/dlls/winejoystick.drv/joystick_osx.c
+++ b/dlls/winejoystick.drv/joystick_osx.c
@@ -263,7 +263,7 @@ static CFIndex find_top_level(IOHIDDeviceRef hid_device, CFMutableArrayRef main_
                 int usage = IOHIDElementGetUsage(element);
 
                 if (usage_page == kHIDPage_GenericDesktop &&
-                    (usage == kHIDUsage_GD_Joystick || usage == kHIDUsage_GD_GamePad))
+                    (usage == kHIDUsage_GD_Joystick || usage == kHIDUsage_GD_GamePad || usage == kHIDUsage_GD_MultiAxisController))
                 {
                     CFArrayAppendValue(main_elements, element);
                     total++;
@@ -283,7 +283,7 @@ static CFIndex find_top_level(IOHIDDeviceRef hid_device, CFMutableArrayRef main_
 static int find_osx_devices(void)
 {
     IOHIDManagerRef hid_manager;
-    int usages[] = { kHIDUsage_GD_Joystick, kHIDUsage_GD_GamePad };
+    int usages[] = { kHIDUsage_GD_Joystick, kHIDUsage_GD_GamePad, kHIDUsage_GD_MultiAxisController };
     int i;
     CFDictionaryRef matching_dicts[sizeof(usages) / sizeof(usages[0])];
     CFArrayRef matching;