The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-14 00:09:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13318 from sanjay900/dont-detach-macos

Browse Source 
LibusbDevice: Don't detach kernel drivers on macOS
This commit is contained in:
OatmealDome 2025-02-08 01:01:58 -05:00 committed by GitHub
commit c770e7c276
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/Core/IOS/USB/LibusbDevice.cpp
View File

@ -439,6 +439,9 @@ static int DoForEachInterface(const Configs& configs, u8 config_num, Function ac
int LibusbDevice::ClaimAllInterfaces(u8 config_num) const
{
const int ret = DoForEachInterface(m_config_descriptors, config_num, [this](u8 i) {
// On macos detaching would fail without root or entitlement.
// We assume user is using GCAdapterDriver and therefore don't want to detach anything
#if !defined(__APPLE__)
const int ret2 = libusb_detach_kernel_driver(m_handle, i);
if (ret2 < LIBUSB_SUCCESS && ret2 != LIBUSB_ERROR_NOT_FOUND &&
ret2 != LIBUSB_ERROR_NOT_SUPPORTED)
@ -447,6 +450,7 @@ int LibusbDevice::ClaimAllInterfaces(u8 config_num) const
LibusbUtils::ErrorWrap(ret2));
return ret2;
}
#endif
return libusb_claim_interface(m_handle, i);
});
if (ret < LIBUSB_SUCCESS)

2
Source/Core/InputCommon/GCAdapter.cpp
View File

@ -584,7 +584,7 @@ static bool CheckDeviceAccess(libusb_device* device)
if (ret == 1) // 1: kernel driver is active
{
// On macos detaching would fail without root or entitlement.
// We assume user is using GCAdapterDriver and therefor don't want to detach anything
// We assume user is using GCAdapterDriver and therefore don't want to detach anything
#if !defined(__APPLE__)
ret = libusb_detach_kernel_driver(s_handle, 0);
detach_failed =