diff options
author | bunnei <bunneidev@gmail.com> | 2018-08-03 14:07:49 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-03 14:07:49 -0400 |
commit | 40e63ede6d2fcb9c4a3f7a65b2bdd25a77835d94 (patch) | |
tree | 1d81b94e3bdcce384aaa892c1d92a48d725680cf /src/core/core.cpp | |
parent | 64806a8397b58e2785297c9de2692edd62fc01c2 (diff) | |
parent | 26de4bb521b1ace7af76eff4f6956cb23ac0d58c (diff) |
Merge pull request #908 from lioncash/memory
core/memory: Get rid of 3DS leftovers
Diffstat (limited to 'src/core/core.cpp')
-rw-r--r-- | src/core/core.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp index 54fc4170f..9824769cf 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -110,7 +110,7 @@ System::ResultStatus System::Load(EmuWindow& emu_window, const std::string& file } } - ResultStatus init_result{Init(emu_window, system_mode.first.get())}; + ResultStatus init_result{Init(emu_window)}; if (init_result != ResultStatus::Success) { LOG_CRITICAL(Core, "Failed to initialize system (Error {})!", static_cast<int>(init_result)); @@ -161,7 +161,7 @@ Cpu& System::CpuCore(size_t core_index) { return *cpu_cores[core_index]; } -System::ResultStatus System::Init(EmuWindow& emu_window, u32 system_mode) { +System::ResultStatus System::Init(EmuWindow& emu_window) { LOG_DEBUG(HW_Memory, "initialized OK"); CoreTiming::Init(); @@ -178,7 +178,7 @@ System::ResultStatus System::Init(EmuWindow& emu_window, u32 system_mode) { telemetry_session = std::make_unique<Core::TelemetrySession>(); service_manager = std::make_shared<Service::SM::ServiceManager>(); - Kernel::Init(system_mode); + Kernel::Init(); Service::Init(service_manager); GDBStub::Init(); |