diff options
| author | 2020-10-12 18:09:15 -0700 | |
|---|---|---|
| committer | 2020-10-12 18:09:15 -0700 | |
| commit | 62c6c9f6a6dbc44de5fa8e03187fb34037958d5f (patch) | |
| tree | 4e232d3671fbb761a9c5eaa6e5d84ad12193fec3 /src/core/core.cpp | |
| parent | Merge pull request #4766 from ReinUsesLisp/tmml-cube (diff) | |
| download | yuzu-62c6c9f6a6dbc44de5fa8e03187fb34037958d5f.tar.gz yuzu-62c6c9f6a6dbc44de5fa8e03187fb34037958d5f.tar.xz yuzu-62c6c9f6a6dbc44de5fa8e03187fb34037958d5f.zip | |
service: time: Update current time with changes to RTC setting.
- This can be used to advance time, e.g. for Pokemon Sword/Shield pokejobs.
Diffstat (limited to 'src/core/core.cpp')
| -rw-r--r-- | src/core/core.cpp | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp index 81e8cc338..fde2ccc09 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp | |||
| @@ -40,6 +40,7 @@ | |||
| 40 | #include "core/hle/service/lm/manager.h" | 40 | #include "core/hle/service/lm/manager.h" |
| 41 | #include "core/hle/service/service.h" | 41 | #include "core/hle/service/service.h" |
| 42 | #include "core/hle/service/sm/sm.h" | 42 | #include "core/hle/service/sm/sm.h" |
| 43 | #include "core/hle/service/time/time_manager.h" | ||
| 43 | #include "core/loader/loader.h" | 44 | #include "core/loader/loader.h" |
| 44 | #include "core/memory.h" | 45 | #include "core/memory.h" |
| 45 | #include "core/memory/cheat_engine.h" | 46 | #include "core/memory/cheat_engine.h" |
| @@ -121,7 +122,7 @@ FileSys::VirtualFile GetGameFileFromPath(const FileSys::VirtualFilesystem& vfs, | |||
| 121 | struct System::Impl { | 122 | struct System::Impl { |
| 122 | explicit Impl(System& system) | 123 | explicit Impl(System& system) |
| 123 | : kernel{system}, fs_controller{system}, memory{system}, | 124 | : kernel{system}, fs_controller{system}, memory{system}, |
| 124 | cpu_manager{system}, reporter{system}, applet_manager{system} {} | 125 | cpu_manager{system}, reporter{system}, applet_manager{system}, time_manager{system} {} |
| 125 | 126 | ||
| 126 | ResultStatus Run() { | 127 | ResultStatus Run() { |
| 127 | status = ResultStatus::Success; | 128 | status = ResultStatus::Success; |
| @@ -189,6 +190,9 @@ struct System::Impl { | |||
| 189 | return ResultStatus::ErrorVideoCore; | 190 | return ResultStatus::ErrorVideoCore; |
| 190 | } | 191 | } |
| 191 | 192 | ||
| 193 | // Initialize time manager, which must happen after kernel is created | ||
| 194 | time_manager.Initialize(); | ||
| 195 | |||
| 192 | is_powered_on = true; | 196 | is_powered_on = true; |
| 193 | exit_lock = false; | 197 | exit_lock = false; |
| 194 | 198 | ||
| @@ -387,6 +391,7 @@ struct System::Impl { | |||
| 387 | /// Service State | 391 | /// Service State |
| 388 | Service::Glue::ARPManager arp_manager; | 392 | Service::Glue::ARPManager arp_manager; |
| 389 | Service::LM::Manager lm_manager{reporter}; | 393 | Service::LM::Manager lm_manager{reporter}; |
| 394 | Service::Time::TimeManager time_manager; | ||
| 390 | 395 | ||
| 391 | /// Service manager | 396 | /// Service manager |
| 392 | std::shared_ptr<Service::SM::ServiceManager> service_manager; | 397 | std::shared_ptr<Service::SM::ServiceManager> service_manager; |
| @@ -717,6 +722,14 @@ const Service::LM::Manager& System::GetLogManager() const { | |||
| 717 | return impl->lm_manager; | 722 | return impl->lm_manager; |
| 718 | } | 723 | } |
| 719 | 724 | ||
| 725 | Service::Time::TimeManager& System::GetTimeManager() { | ||
| 726 | return impl->time_manager; | ||
| 727 | } | ||
| 728 | |||
| 729 | const Service::Time::TimeManager& System::GetTimeManager() const { | ||
| 730 | return impl->time_manager; | ||
| 731 | } | ||
| 732 | |||
| 720 | void System::SetExitLock(bool locked) { | 733 | void System::SetExitLock(bool locked) { |
| 721 | impl->exit_lock = locked; | 734 | impl->exit_lock = locked; |
| 722 | } | 735 | } |