diff options
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/core.cpp | 14 | ||||
| -rw-r--r-- | src/core/core.h | 7 |
2 files changed, 19 insertions, 2 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp index 229cb879c..b14f74976 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp | |||
| @@ -36,6 +36,7 @@ | |||
| 36 | #include "core/hle/kernel/k_scheduler.h" | 36 | #include "core/hle/kernel/k_scheduler.h" |
| 37 | #include "core/hle/kernel/kernel.h" | 37 | #include "core/hle/kernel/kernel.h" |
| 38 | #include "core/hle/kernel/physical_core.h" | 38 | #include "core/hle/kernel/physical_core.h" |
| 39 | #include "core/hle/service/acc/profile_manager.h" | ||
| 39 | #include "core/hle/service/am/applets/applets.h" | 40 | #include "core/hle/service/am/applets/applets.h" |
| 40 | #include "core/hle/service/apm/apm_controller.h" | 41 | #include "core/hle/service/apm/apm_controller.h" |
| 41 | #include "core/hle/service/filesystem/filesystem.h" | 42 | #include "core/hle/service/filesystem/filesystem.h" |
| @@ -130,8 +131,8 @@ FileSys::VirtualFile GetGameFileFromPath(const FileSys::VirtualFilesystem& vfs, | |||
| 130 | struct System::Impl { | 131 | struct System::Impl { |
| 131 | explicit Impl(System& system) | 132 | explicit Impl(System& system) |
| 132 | : kernel{system}, fs_controller{system}, memory{system}, hid_core{}, room_network{}, | 133 | : kernel{system}, fs_controller{system}, memory{system}, hid_core{}, room_network{}, |
| 133 | cpu_manager{system}, reporter{system}, applet_manager{system}, time_manager{system}, | 134 | cpu_manager{system}, reporter{system}, applet_manager{system}, profile_manager{}, |
| 134 | gpu_dirty_memory_write_manager{} { | 135 | time_manager{system}, gpu_dirty_memory_write_manager{} { |
| 135 | memory.SetGPUDirtyManagers(gpu_dirty_memory_write_manager); | 136 | memory.SetGPUDirtyManagers(gpu_dirty_memory_write_manager); |
| 136 | } | 137 | } |
| 137 | 138 | ||
| @@ -532,6 +533,7 @@ struct System::Impl { | |||
| 532 | 533 | ||
| 533 | /// Service State | 534 | /// Service State |
| 534 | Service::Glue::ARPManager arp_manager; | 535 | Service::Glue::ARPManager arp_manager; |
| 536 | Service::Account::ProfileManager profile_manager; | ||
| 535 | Service::Time::TimeManager time_manager; | 537 | Service::Time::TimeManager time_manager; |
| 536 | 538 | ||
| 537 | /// Service manager | 539 | /// Service manager |
| @@ -921,6 +923,14 @@ const Service::APM::Controller& System::GetAPMController() const { | |||
| 921 | return impl->apm_controller; | 923 | return impl->apm_controller; |
| 922 | } | 924 | } |
| 923 | 925 | ||
| 926 | Service::Account::ProfileManager& System::GetProfileManager() { | ||
| 927 | return impl->profile_manager; | ||
| 928 | } | ||
| 929 | |||
| 930 | const Service::Account::ProfileManager& System::GetProfileManager() const { | ||
| 931 | return impl->profile_manager; | ||
| 932 | } | ||
| 933 | |||
| 924 | Service::Time::TimeManager& System::GetTimeManager() { | 934 | Service::Time::TimeManager& System::GetTimeManager() { |
| 925 | return impl->time_manager; | 935 | return impl->time_manager; |
| 926 | } | 936 | } |
diff --git a/src/core/core.h b/src/core/core.h index 05a222f5c..473204db7 100644 --- a/src/core/core.h +++ b/src/core/core.h | |||
| @@ -45,6 +45,10 @@ class Memory; | |||
| 45 | 45 | ||
| 46 | namespace Service { | 46 | namespace Service { |
| 47 | 47 | ||
| 48 | namespace Account { | ||
| 49 | class ProfileManager; | ||
| 50 | } // namespace Account | ||
| 51 | |||
| 48 | namespace AM::Applets { | 52 | namespace AM::Applets { |
| 49 | struct AppletFrontendSet; | 53 | struct AppletFrontendSet; |
| 50 | class AppletManager; | 54 | class AppletManager; |
| @@ -383,6 +387,9 @@ public: | |||
| 383 | [[nodiscard]] Service::APM::Controller& GetAPMController(); | 387 | [[nodiscard]] Service::APM::Controller& GetAPMController(); |
| 384 | [[nodiscard]] const Service::APM::Controller& GetAPMController() const; | 388 | [[nodiscard]] const Service::APM::Controller& GetAPMController() const; |
| 385 | 389 | ||
| 390 | [[nodiscard]] Service::Account::ProfileManager& GetProfileManager(); | ||
| 391 | [[nodiscard]] const Service::Account::ProfileManager& GetProfileManager() const; | ||
| 392 | |||
| 386 | [[nodiscard]] Service::Time::TimeManager& GetTimeManager(); | 393 | [[nodiscard]] Service::Time::TimeManager& GetTimeManager(); |
| 387 | [[nodiscard]] const Service::Time::TimeManager& GetTimeManager() const; | 394 | [[nodiscard]] const Service::Time::TimeManager& GetTimeManager() const; |
| 388 | 395 | ||