summaryrefslogtreecommitdiff
path: root/src/core/core.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/core.cpp')
-rw-r--r--src/core/core.cpp15
1 files changed, 12 insertions, 3 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp
index 92ba42fb9..eb2c2e204 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -35,6 +35,7 @@
35#include "core/hle/service/apm/controller.h" 35#include "core/hle/service/apm/controller.h"
36#include "core/hle/service/filesystem/filesystem.h" 36#include "core/hle/service/filesystem/filesystem.h"
37#include "core/hle/service/glue/manager.h" 37#include "core/hle/service/glue/manager.h"
38#include "core/hle/service/lm/manager.h"
38#include "core/hle/service/service.h" 39#include "core/hle/service/service.h"
39#include "core/hle/service/sm/sm.h" 40#include "core/hle/service/sm/sm.h"
40#include "core/loader/loader.h" 41#include "core/loader/loader.h"
@@ -337,6 +338,7 @@ struct System::Impl {
337 bool is_powered_on = false; 338 bool is_powered_on = false;
338 bool exit_lock = false; 339 bool exit_lock = false;
339 340
341 Reporter reporter;
340 std::unique_ptr<Memory::CheatEngine> cheat_engine; 342 std::unique_ptr<Memory::CheatEngine> cheat_engine;
341 std::unique_ptr<Tools::Freezer> memory_freezer; 343 std::unique_ptr<Tools::Freezer> memory_freezer;
342 344
@@ -346,8 +348,9 @@ struct System::Impl {
346 /// APM (Performance) services 348 /// APM (Performance) services
347 Service::APM::Controller apm_controller{core_timing}; 349 Service::APM::Controller apm_controller{core_timing};
348 350
349 /// Glue services 351 /// Service State
350 Service::Glue::ARPManager arp_manager; 352 Service::Glue::ARPManager arp_manager;
353 Service::LM::Manager lm_manager{reporter};
351 354
352 /// Service manager 355 /// Service manager
353 std::shared_ptr<Service::SM::ServiceManager> service_manager; 356 std::shared_ptr<Service::SM::ServiceManager> service_manager;
@@ -355,8 +358,6 @@ struct System::Impl {
355 /// Telemetry session for this emulation session 358 /// Telemetry session for this emulation session
356 std::unique_ptr<Core::TelemetrySession> telemetry_session; 359 std::unique_ptr<Core::TelemetrySession> telemetry_session;
357 360
358 Reporter reporter;
359
360 ResultStatus status = ResultStatus::Success; 361 ResultStatus status = ResultStatus::Success;
361 std::string status_details = ""; 362 std::string status_details = "";
362 363
@@ -632,6 +633,14 @@ const Service::APM::Controller& System::GetAPMController() const {
632 return impl->apm_controller; 633 return impl->apm_controller;
633} 634}
634 635
636Service::LM::Manager& System::GetLogManager() {
637 return impl->lm_manager;
638}
639
640const Service::LM::Manager& System::GetLogManager() const {
641 return impl->lm_manager;
642}
643
635void System::SetExitLock(bool locked) { 644void System::SetExitLock(bool locked) {
636 impl->exit_lock = locked; 645 impl->exit_lock = locked;
637} 646}