summaryrefslogtreecommitdiff
path: root/src/core/core.cpp
diff options
context:
space:
mode:
authorGravatar bunnei2018-08-03 14:07:49 -0400
committerGravatar GitHub2018-08-03 14:07:49 -0400
commit40e63ede6d2fcb9c4a3f7a65b2bdd25a77835d94 (patch)
tree1d81b94e3bdcce384aaa892c1d92a48d725680cf /src/core/core.cpp
parentMerge pull request #909 from lioncash/const (diff)
parentcore/memory: Get rid of 3DS leftovers (diff)
downloadyuzu-40e63ede6d2fcb9c4a3f7a65b2bdd25a77835d94.tar.gz
yuzu-40e63ede6d2fcb9c4a3f7a65b2bdd25a77835d94.tar.xz
yuzu-40e63ede6d2fcb9c4a3f7a65b2bdd25a77835d94.zip
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.cpp6
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
110 } 110 }
111 } 111 }
112 112
113 ResultStatus init_result{Init(emu_window, system_mode.first.get())}; 113 ResultStatus init_result{Init(emu_window)};
114 if (init_result != ResultStatus::Success) { 114 if (init_result != ResultStatus::Success) {
115 LOG_CRITICAL(Core, "Failed to initialize system (Error {})!", 115 LOG_CRITICAL(Core, "Failed to initialize system (Error {})!",
116 static_cast<int>(init_result)); 116 static_cast<int>(init_result));
@@ -161,7 +161,7 @@ Cpu& System::CpuCore(size_t core_index) {
161 return *cpu_cores[core_index]; 161 return *cpu_cores[core_index];
162} 162}
163 163
164System::ResultStatus System::Init(EmuWindow& emu_window, u32 system_mode) { 164System::ResultStatus System::Init(EmuWindow& emu_window) {
165 LOG_DEBUG(HW_Memory, "initialized OK"); 165 LOG_DEBUG(HW_Memory, "initialized OK");
166 166
167 CoreTiming::Init(); 167 CoreTiming::Init();
@@ -178,7 +178,7 @@ System::ResultStatus System::Init(EmuWindow& emu_window, u32 system_mode) {
178 telemetry_session = std::make_unique<Core::TelemetrySession>(); 178 telemetry_session = std::make_unique<Core::TelemetrySession>();
179 service_manager = std::make_shared<Service::SM::ServiceManager>(); 179 service_manager = std::make_shared<Service::SM::ServiceManager>();
180 180
181 Kernel::Init(system_mode); 181 Kernel::Init();
182 Service::Init(service_manager); 182 Service::Init(service_manager);
183 GDBStub::Init(); 183 GDBStub::Init();
184 184