From 4163be67a157fe3d3446cce7c53c310dd7457e10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Mon, 9 Jan 2017 10:05:50 +0100 Subject: [PATCH] OSX: Revert back to kHIDUsage_GD_Joystick Bug introduced in 547a57777b199f451305a6d4b6ad63fb0b2bd3ed. --- platform/osx/joypad_osx.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/osx/joypad_osx.cpp b/platform/osx/joypad_osx.cpp index 4a8744d3aad..5d25017aa63 100644 --- a/platform/osx/joypad_osx.cpp +++ b/platform/osx/joypad_osx.cpp @@ -234,7 +234,7 @@ static bool is_joypad(IOHIDDeviceRef p_device_ref) { if (refCF) { CFNumberGetValue((CFNumberRef) refCF, kCFNumberSInt32Type, &usage); } - if ((usage != kHIDUsage_GD_Joypad && + if ((usage != kHIDUsage_GD_Joystick && usage != kHIDUsage_GD_GamePad && usage != kHIDUsage_GD_MultiAxisController)) { return false; @@ -588,7 +588,7 @@ JoypadOSX::JoypadOSX() int okay = 1; const void *vals[] = { - (void *) create_match_dictionary(kHIDPage_GenericDesktop, kHIDUsage_GD_Joypad, &okay), + (void *) create_match_dictionary(kHIDPage_GenericDesktop, kHIDUsage_GD_Joystick, &okay), (void *) create_match_dictionary(kHIDPage_GenericDesktop, kHIDUsage_GD_GamePad, &okay), (void *) create_match_dictionary(kHIDPage_GenericDesktop, kHIDUsage_GD_MultiAxisController, &okay), };