aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/system.cpp
diff options
context:
space:
mode:
authorGravatar Yuri Kunde Schlesner <yuriks@yuriks.net>2014-12-14 05:55:11 -0200
committerGravatar Yuri Kunde Schlesner <yuriks@yuriks.net>2014-12-16 01:08:38 -0200
commitca67bb7945bf358cf38242a04febfd3375760947 (patch)
tree831ebab2a75fc4b096f61dfefaa462805e22ac4e /src/core/system.cpp
parentc72ccfa6db41039ef2eb0ce118fabe1b38da841e (diff)
HLE: Rename namespaces to match move & fix initialization order
Diffstat (limited to 'src/core/system.cpp')
-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 43d0eef2..2885ff45 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