summaryrefslogtreecommitdiffstats
path: root/src/core/core.cpp
diff options
context:
space:
mode:
authorZach Hilman <zachhilman@gmail.com>2019-06-29 23:17:35 +0200
committerZach Hilman <zachhilman@gmail.com>2019-09-22 18:34:55 +0200
commit4153bd8d171ffe7cd11c467b338f843859565d51 (patch)
tree024f3a856b4aab1398f836c243382a3962f6e666 /src/core/core.cpp
parentreporter: Add log output for packaged lm log data (diff)
downloadyuzu-4153bd8d171ffe7cd11c467b338f843859565d51.tar
yuzu-4153bd8d171ffe7cd11c467b338f843859565d51.tar.gz
yuzu-4153bd8d171ffe7cd11c467b338f843859565d51.tar.bz2
yuzu-4153bd8d171ffe7cd11c467b338f843859565d51.tar.lz
yuzu-4153bd8d171ffe7cd11c467b338f843859565d51.tar.xz
yuzu-4153bd8d171ffe7cd11c467b338f843859565d51.tar.zst
yuzu-4153bd8d171ffe7cd11c467b338f843859565d51.zip
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 @@
#include "core/hle/service/apm/controller.h"
#include "core/hle/service/filesystem/filesystem.h"
#include "core/hle/service/glue/manager.h"
+#include "core/hle/service/lm/manager.h"
#include "core/hle/service/service.h"
#include "core/hle/service/sm/sm.h"
#include "core/loader/loader.h"
@@ -337,6 +338,7 @@ struct System::Impl {
bool is_powered_on = false;
bool exit_lock = false;
+ Reporter reporter;
std::unique_ptr<Memory::CheatEngine> cheat_engine;
std::unique_ptr<Tools::Freezer> memory_freezer;
@@ -346,8 +348,9 @@ struct System::Impl {
/// APM (Performance) services
Service::APM::Controller apm_controller{core_timing};
- /// Glue services
+ /// Service State
Service::Glue::ARPManager arp_manager;
+ Service::LM::Manager lm_manager{reporter};
/// Service manager
std::shared_ptr<Service::SM::ServiceManager> service_manager;
@@ -355,8 +358,6 @@ struct System::Impl {
/// Telemetry session for this emulation session
std::unique_ptr<Core::TelemetrySession> telemetry_session;
- Reporter reporter;
-
ResultStatus status = ResultStatus::Success;
std::string status_details = "";
@@ -632,6 +633,14 @@ const Service::APM::Controller& System::GetAPMController() const {
return impl->apm_controller;
}
+Service::LM::Manager& System::GetLogManager() {
+ return impl->lm_manager;
+}
+
+const Service::LM::Manager& System::GetLogManager() const {
+ return impl->lm_manager;
+}
+
void System::SetExitLock(bool locked) {
impl->exit_lock = locked;
}