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 #5417 from leoetlino/constructor 

IOS: Fix AddCoreDevices being called twice
This commit is contained in:
Leo Lam 2017-05-13 23:20:22 +02:00 committed by GitHub
parent 0f504e7a84 adf9218e74
commit 690e61b997
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -200,9 +200,12 @@ Kernel::~Kernel()
Core::ShutdownWiiRoot(); Core::ShutdownWiiRoot();
} }
EmulationKernel::EmulationKernel(u64 title_id) Kernel::Kernel(u64 title_id) : m_title_id(title_id)
{
}
EmulationKernel::EmulationKernel(u64 title_id) : Kernel(title_id)
{ {
m_title_id = title_id;
INFO_LOG(IOS, "Starting IOS %016" PRIx64, title_id); INFO_LOG(IOS, "Starting IOS %016" PRIx64, title_id);
if (!SetupMemory(title_id, MemorySetupType::IOSReload)) if (!SetupMemory(title_id, MemorySetupType::IOSReload))

2
Source/Core/Core/IOS/IOS.h
View File

@ -118,6 +118,8 @@ public:
IOSC& GetIOSC(); IOSC& GetIOSC();
protected: protected:
explicit Kernel(u64 title_id);
void ExecuteIPCCommand(u32 address); void ExecuteIPCCommand(u32 address);
IPCCommandResult HandleIPCCommand(const Request& request); IPCCommandResult HandleIPCCommand(const Request& request);
void EnqueueIPCAcknowledgement(u32 address, int cycles_in_future = 0); void EnqueueIPCAcknowledgement(u32 address, int cycles_in_future = 0);