ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11786 from AdmiralCurtiss/ios-dolphin-device 

IOS: Only construct DolphinDevice on EmulationKernel IOS instances.
This commit is contained in:
Léo Lam 2023-04-25 00:41:56 +01:00 committed by GitHub
parent ffbbd72741 4d49902b34
commit a08b5f7c35
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -544,7 +544,6 @@ void Kernel::AddCoreDevices()
std::lock_guard lock(m_device_map_mutex); std::lock_guard lock(m_device_map_mutex);
AddDevice(std::make_unique<FSDevice>(*this, "/dev/fs")); AddDevice(std::make_unique<FSDevice>(*this, "/dev/fs"));
AddDevice(std::make_unique<ESDevice>(*this, "/dev/es")); AddDevice(std::make_unique<ESDevice>(*this, "/dev/es"));
AddDevice(std::make_unique<DolphinDevice>(*this, "/dev/dolphin"));
} }
void Kernel::AddStaticDevices() void Kernel::AddStaticDevices()
@ -553,6 +552,9 @@ void Kernel::AddStaticDevices()
const Feature features = GetFeatures(GetVersion()); const Feature features = GetFeatures(GetVersion());
// Dolphin-specific device for letting homebrew access and alter emulator state.
AddDevice(std::make_unique<DolphinDevice>(*this, "/dev/dolphin"));
// OH1 (Bluetooth) // OH1 (Bluetooth)
AddDevice(std::make_unique<DeviceStub>(*this, "/dev/usb/oh1")); AddDevice(std::make_unique<DeviceStub>(*this, "/dev/usb/oh1"));
if (!Config::Get(Config::MAIN_BLUETOOTH_PASSTHROUGH_ENABLED)) if (!Config::Get(Config::MAIN_BLUETOOTH_PASSTHROUGH_ENABLED))