diff options
| author | 2015-01-08 22:38:33 -0500 | |
|---|---|---|
| committer | 2015-01-08 22:38:33 -0500 | |
| commit | d46f6500363024ac58cc23ba706e26d531a6076a (patch) | |
| tree | b5818b8b26092f425dccff628517f51fde47aaed /src/core/hle/kernel/kernel.cpp | |
| parent | Merge pull request #451 from Subv/wut (diff) | |
| parent | SVC: Implemented the Timer service calls. (diff) | |
| download | yuzu-d46f6500363024ac58cc23ba706e26d531a6076a.tar.gz yuzu-d46f6500363024ac58cc23ba706e26d531a6076a.tar.xz yuzu-d46f6500363024ac58cc23ba706e26d531a6076a.zip | |
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 ae2c11a1c..391e833c0 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp | |||
| @@ -9,6 +9,7 @@ | |||
| 9 | #include "core/core.h" | 9 | #include "core/core.h" |
| 10 | #include "core/hle/kernel/kernel.h" | 10 | #include "core/hle/kernel/kernel.h" |
| 11 | #include "core/hle/kernel/thread.h" | 11 | #include "core/hle/kernel/thread.h" |
| 12 | #include "core/hle/kernel/timer.h" | ||
| 12 | 13 | ||
| 13 | namespace Kernel { | 14 | namespace Kernel { |
| 14 | 15 | ||
| @@ -105,12 +106,13 @@ void HandleTable::Clear() { | |||
| 105 | /// Initialize the kernel | 106 | /// Initialize the kernel |
| 106 | void Init() { | 107 | void Init() { |
| 107 | Kernel::ThreadingInit(); | 108 | Kernel::ThreadingInit(); |
| 109 | Kernel::TimersInit(); | ||
| 108 | } | 110 | } |
| 109 | 111 | ||
| 110 | /// Shutdown the kernel | 112 | /// Shutdown the kernel |
| 111 | void Shutdown() { | 113 | void Shutdown() { |
| 112 | Kernel::ThreadingShutdown(); | 114 | Kernel::ThreadingShutdown(); |
| 113 | 115 | Kernel::TimersShutdown(); | |
| 114 | g_handle_table.Clear(); // Free all kernel objects | 116 | g_handle_table.Clear(); // Free all kernel objects |
| 115 | } | 117 | } |
| 116 | 118 | ||