summaryrefslogtreecommitdiffstats
path: root/src/core/system.cpp
diff options
context:
space:
mode:
authorYuri Kunde Schlesner <yuriks@yuriks.net>2014-12-14 08:55:11 +0100
committerYuri Kunde Schlesner <yuriks@yuriks.net>2014-12-16 04:08:38 +0100
commitca67bb7945bf358cf38242a04febfd3375760947 (patch)
tree831ebab2a75fc4b096f61dfefaa462805e22ac4e /src/core/system.cpp
parentHLE: Move kernel/archive.* to service/fs/ (diff)
downloadyuzu-ca67bb7945bf358cf38242a04febfd3375760947.tar
yuzu-ca67bb7945bf358cf38242a04febfd3375760947.tar.gz
yuzu-ca67bb7945bf358cf38242a04febfd3375760947.tar.bz2
yuzu-ca67bb7945bf358cf38242a04febfd3375760947.tar.lz
yuzu-ca67bb7945bf358cf38242a04febfd3375760947.tar.xz
yuzu-ca67bb7945bf358cf38242a04febfd3375760947.tar.zst
yuzu-ca67bb7945bf358cf38242a04febfd3375760947.zip
Diffstat (limited to '')
-rw-r--r--src/core/system.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/core/system.cpp b/src/core/system.cpp
index 43d0eef2c..2885ff45f 100644
--- a/src/core/system.cpp
+++ b/src/core/system.cpp
@@ -23,10 +23,10 @@ void Init(EmuWindow* emu_window) {
Core::Init();
Memory::Init();
HW::Init();
+ Kernel::Init();
HLE::Init();
CoreTiming::Init();
VideoCore::Init(emu_window);
- Kernel::Init();
}
void RunLoopFor(int cycles) {
@@ -37,13 +37,13 @@ void RunLoopUntil(u64 global_cycles) {
}
void Shutdown() {
- Core::Shutdown();
- Memory::Shutdown();
- HW::Shutdown();
- HLE::Shutdown();
- CoreTiming::Shutdown();
VideoCore::Shutdown();
+ CoreTiming::Shutdown();
+ HLE::Shutdown();
Kernel::Shutdown();
+ HW::Shutdown();
+ Memory::Shutdown();
+ Core::Shutdown();
}
} // namespace