diff options
| author | bunnei <bunneidev@gmail.com> | 2015-01-08 22:38:33 -0500 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2015-01-08 22:38:33 -0500 |
| commit | d46f6500363024ac58cc23ba706e26d531a6076a (patch) | |
| tree | b5818b8b26092f425dccff628517f51fde47aaed /src/core/hle/kernel/kernel.cpp | |
| parent | 97cfdd16e637edceb08c81f446964bb9f52330b9 (diff) | |
| parent | 07044651ef2644451dc4f78045856ad078cb69fe (diff) | |
Merge pull request #255 from Subv/cbranch_3
Implemented timers
Diffstat (limited to 'src/core/hle/kernel/kernel.cpp')
| -rw-r--r-- | src/core/hle/kernel/kernel.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index ae2c11a1ca..391e833c01 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp @@ -9,6 +9,7 @@ #include "core/core.h" #include "core/hle/kernel/kernel.h" #include "core/hle/kernel/thread.h" +#include "core/hle/kernel/timer.h" namespace Kernel { @@ -105,12 +106,13 @@ void HandleTable::Clear() { /// Initialize the kernel void Init() { Kernel::ThreadingInit(); + Kernel::TimersInit(); } /// Shutdown the kernel void Shutdown() { Kernel::ThreadingShutdown(); - + Kernel::TimersShutdown(); g_handle_table.Clear(); // Free all kernel objects } |