diff options
Diffstat (limited to '')
| -rw-r--r-- | src/core/system.cpp | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/core/system.cpp b/src/core/system.cpp index edb07fef5..c77092327 100644 --- a/src/core/system.cpp +++ b/src/core/system.cpp | |||
| @@ -7,6 +7,7 @@ | |||
| 7 | #include "core/mem_map.h" | 7 | #include "core/mem_map.h" |
| 8 | #include "core/system.h" | 8 | #include "core/system.h" |
| 9 | #include "core/hw/hw.h" | 9 | #include "core/hw/hw.h" |
| 10 | #include "core/hle/hle.h" | ||
| 10 | 11 | ||
| 11 | #include "video_core/video_core.h" | 12 | #include "video_core/video_core.h" |
| 12 | 13 | ||
| @@ -19,15 +20,16 @@ void UpdateState(State state) { | |||
| 19 | } | 20 | } |
| 20 | 21 | ||
| 21 | void Init(EmuWindow* emu_window) { | 22 | void Init(EmuWindow* emu_window) { |
| 22 | Core::Init(); | 23 | Core::Init(); |
| 23 | Memory::Init(); | 24 | Memory::Init(); |
| 24 | HW::Init(); | 25 | HW::Init(); |
| 25 | CoreTiming::Init(); | 26 | HLE::Init(); |
| 27 | CoreTiming::Init(); | ||
| 26 | VideoCore::Init(emu_window); | 28 | VideoCore::Init(emu_window); |
| 27 | } | 29 | } |
| 28 | 30 | ||
| 29 | void RunLoopFor(int cycles) { | 31 | void RunLoopFor(int cycles) { |
| 30 | RunLoopUntil(CoreTiming::GetTicks() + cycles); | 32 | RunLoopUntil(CoreTiming::GetTicks() + cycles); |
| 31 | } | 33 | } |
| 32 | 34 | ||
| 33 | void RunLoopUntil(u64 global_cycles) { | 35 | void RunLoopUntil(u64 global_cycles) { |
| @@ -35,9 +37,12 @@ void RunLoopUntil(u64 global_cycles) { | |||
| 35 | 37 | ||
| 36 | void Shutdown() { | 38 | void Shutdown() { |
| 37 | Core::Shutdown(); | 39 | Core::Shutdown(); |
| 40 | Memory::Shutdown(); | ||
| 38 | HW::Shutdown(); | 41 | HW::Shutdown(); |
| 42 | HLE::Shutdown(); | ||
| 43 | CoreTiming::Shutdown(); | ||
| 39 | VideoCore::Shutdown(); | 44 | VideoCore::Shutdown(); |
| 40 | g_ctr_file_system.Shutdown(); | 45 | g_ctr_file_system.Shutdown(); |
| 41 | } | 46 | } |
| 42 | 47 | ||
| 43 | } // namespace | 48 | } // namespace |