diff options
Diffstat (limited to 'src/core/hle/kernel/timer.cpp')
| -rw-r--r-- | src/core/hle/kernel/timer.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/core/hle/kernel/timer.cpp b/src/core/hle/kernel/timer.cpp index 7c3cdc0d0..4352fc99c 100644 --- a/src/core/hle/kernel/timer.cpp +++ b/src/core/hle/kernel/timer.cpp | |||
| @@ -20,10 +20,8 @@ static Kernel::HandleTable timer_callback_handle_table; | |||
| 20 | Timer::Timer() {} | 20 | Timer::Timer() {} |
| 21 | Timer::~Timer() {} | 21 | Timer::~Timer() {} |
| 22 | 22 | ||
| 23 | ResultVal<SharedPtr<Timer>> Timer::Create(ResetType reset_type, std::string name) { | 23 | SharedPtr<Timer> Timer::Create(ResetType reset_type, std::string name) { |
| 24 | SharedPtr<Timer> timer(new Timer); | 24 | SharedPtr<Timer> timer(new Timer); |
| 25 | // TOOD(yuriks): Don't create Handle (see Thread::Create()) | ||
| 26 | CASCADE_RESULT(auto unused, Kernel::g_handle_table.Create(timer)); | ||
| 27 | 25 | ||
| 28 | timer->reset_type = reset_type; | 26 | timer->reset_type = reset_type; |
| 29 | timer->signaled = false; | 27 | timer->signaled = false; |
| @@ -31,7 +29,8 @@ ResultVal<SharedPtr<Timer>> Timer::Create(ResetType reset_type, std::string name | |||
| 31 | timer->initial_delay = 0; | 29 | timer->initial_delay = 0; |
| 32 | timer->interval_delay = 0; | 30 | timer->interval_delay = 0; |
| 33 | timer->callback_handle = timer_callback_handle_table.Create(timer).MoveFrom(); | 31 | timer->callback_handle = timer_callback_handle_table.Create(timer).MoveFrom(); |
| 34 | return MakeResult<SharedPtr<Timer>>(timer); | 32 | |
| 33 | return timer; | ||
| 35 | } | 34 | } |
| 36 | 35 | ||
| 37 | bool Timer::ShouldWait() { | 36 | bool Timer::ShouldWait() { |