aboutsummaryrefslogtreecommitdiff
path: root/src/core/core.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/core.h')
-rw-r--r--src/core/core.h19
1 files changed, 12 insertions, 7 deletions
diff --git a/src/core/core.h b/src/core/core.h
index f49b7fbf9..90e7ac607 100644
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -8,7 +8,6 @@
#include <memory>
#include <string>
-#include <map>
#include "common/common_types.h"
#include "core/file_sys/vfs_types.h"
#include "core/hle/kernel/object.h"
@@ -58,6 +57,10 @@ namespace Glue {
class ARPManager;
}
+namespace LM {
+class Manager;
+} // namespace LM
+
namespace SM {
class ServiceManager;
} // namespace SM
@@ -98,6 +101,8 @@ FileSys::VirtualFile GetGameFileFromPath(const FileSys::VirtualFilesystem& vfs,
class System {
public:
+ using CurrentBuildProcessID = std::array<u8, 0x20>;
+
System(const System&) = delete;
System& operator=(const System&) = delete;
@@ -326,13 +331,17 @@ public:
const Service::APM::Controller& GetAPMController() const;
+ Service::LM::Manager& GetLogManager();
+
+ const Service::LM::Manager& GetLogManager() const;
+
void SetExitLock(bool locked);
bool GetExitLock() const;
- void SetCurrentProcessBuildID(std::array<u8, 0x20> id);
+ void SetCurrentProcessBuildID(const CurrentBuildProcessID& id);
- const std::array<u8, 0x20>& GetCurrentProcessBuildID() const;
+ const CurrentBuildProcessID& GetCurrentProcessBuildID() const;
private:
System();
@@ -357,8 +366,4 @@ private:
static System s_instance;
};
-inline Kernel::Process* CurrentProcess() {
- return System::GetInstance().CurrentProcess();
-}
-
} // namespace Core