[v3 3/4] winejoystick.drv/joystick_osx.c: adds multi-axis controller

[David Lawrie]

Adds support for finding general multi-axis controllers in addition to
gamepads and joysticks.

Source:
http://opensource.apple.com//source/IOHIDFamily/IOHIDFamily-315.7.16/
IOHIDFamily/IOHIDUsageTables.h

Tested on OS X 10.10.5.

v2: whitespace fixes
v3: split patch up

Signed-off-by: David Lawrie david.dljunk at gmail.com
---
 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 4e59ca3..b400ca6 100644
--- a/dlls/winejoystick.drv/joystick_osx.c
+++ b/dlls/winejoystick.drv/joystick_osx.c
@@ -264,7 +264,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++;
@@ -284,7 +284,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;
-- 
2.5.4 (Apple Git-61)