diff options
author | bunnei <bunneidev@gmail.com> | 2018-07-27 16:18:50 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-27 16:18:50 +0200 |
commit | dc4e5f91596392bcdfb316105f80feea636c72c2 (patch) | |
tree | c683d45d71608318325ef78ada1d3cb25e369ad6 /src/core/hle/kernel | |
parent | Merge pull request #833 from lioncash/irs (diff) | |
parent | kernel/timer: Make data members private where applicable (diff) | |
download | yuzu-dc4e5f91596392bcdfb316105f80feea636c72c2.tar yuzu-dc4e5f91596392bcdfb316105f80feea636c72c2.tar.gz yuzu-dc4e5f91596392bcdfb316105f80feea636c72c2.tar.bz2 yuzu-dc4e5f91596392bcdfb316105f80feea636c72c2.tar.lz yuzu-dc4e5f91596392bcdfb316105f80feea636c72c2.tar.xz yuzu-dc4e5f91596392bcdfb316105f80feea636c72c2.tar.zst yuzu-dc4e5f91596392bcdfb316105f80feea636c72c2.zip |
Diffstat (limited to 'src/core/hle/kernel')
-rw-r--r-- | src/core/hle/kernel/timer.h | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/src/core/hle/kernel/timer.h b/src/core/hle/kernel/timer.h index 82d19cefc..c63f0ed90 100644 --- a/src/core/hle/kernel/timer.h +++ b/src/core/hle/kernel/timer.h @@ -32,13 +32,17 @@ public: return HANDLE_TYPE; } - ResetType reset_type; ///< The ResetType of this timer + ResetType GetResetType() const { + return reset_type; + } - bool signaled; ///< Whether the timer has been signaled or not - std::string name; ///< Name of timer (optional) + u64 GetInitialDelay() const { + return initial_delay; + } - u64 initial_delay; ///< The delay until the timer fires for the first time - u64 interval_delay; ///< The delay until the timer fires after the first time + u64 GetIntervalDelay() const { + return interval_delay; + } bool ShouldWait(Thread* thread) const override; void Acquire(Thread* thread) override; @@ -67,6 +71,14 @@ private: Timer(); ~Timer() override; + ResetType reset_type; ///< The ResetType of this timer + + u64 initial_delay; ///< The delay until the timer fires for the first time + u64 interval_delay; ///< The delay until the timer fires after the first time + + bool signaled; ///< Whether the timer has been signaled or not + std::string name; ///< Name of timer (optional) + /// Handle used as userdata to reference this object when inserting into the CoreTiming queue. Handle callback_handle; }; |