diff options
| author | 2016-09-18 09:38:01 +0900 | |
|---|---|---|
| committer | 2016-09-18 09:38:01 +0900 | |
| commit | dc8479928c5aee4c6ad6fe4f59006fb604cee701 (patch) | |
| tree | 569a7f13128450bbab973236615587ff00bced5f /src/core/hle/kernel/timer.h | |
| parent | Travis: Import Dolphin’s clang-format hook. (diff) | |
| download | yuzu-dc8479928c5aee4c6ad6fe4f59006fb604cee701.tar.gz yuzu-dc8479928c5aee4c6ad6fe4f59006fb604cee701.tar.xz yuzu-dc8479928c5aee4c6ad6fe4f59006fb604cee701.zip | |
Sources: Run clang-format on everything.
Diffstat (limited to 'src/core/hle/kernel/timer.h')
| -rw-r--r-- | src/core/hle/kernel/timer.h | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/src/core/hle/kernel/timer.h b/src/core/hle/kernel/timer.h index b1db60e8f..97cd0d63c 100644 --- a/src/core/hle/kernel/timer.h +++ b/src/core/hle/kernel/timer.h | |||
| @@ -21,19 +21,25 @@ public: | |||
| 21 | */ | 21 | */ |
| 22 | static SharedPtr<Timer> Create(ResetType reset_type, std::string name = "Unknown"); | 22 | static SharedPtr<Timer> Create(ResetType reset_type, std::string name = "Unknown"); |
| 23 | 23 | ||
| 24 | std::string GetTypeName() const override { return "Timer"; } | 24 | std::string GetTypeName() const override { |
| 25 | std::string GetName() const override { return name; } | 25 | return "Timer"; |
| 26 | } | ||
| 27 | std::string GetName() const override { | ||
| 28 | return name; | ||
| 29 | } | ||
| 26 | 30 | ||
| 27 | static const HandleType HANDLE_TYPE = HandleType::Timer; | 31 | static const HandleType HANDLE_TYPE = HandleType::Timer; |
| 28 | HandleType GetHandleType() const override { return HANDLE_TYPE; } | 32 | HandleType GetHandleType() const override { |
| 33 | return HANDLE_TYPE; | ||
| 34 | } | ||
| 29 | 35 | ||
| 30 | ResetType reset_type; ///< The ResetType of this timer | 36 | ResetType reset_type; ///< The ResetType of this timer |
| 31 | 37 | ||
| 32 | bool signaled; ///< Whether the timer has been signaled or not | 38 | bool signaled; ///< Whether the timer has been signaled or not |
| 33 | std::string name; ///< Name of timer (optional) | 39 | std::string name; ///< Name of timer (optional) |
| 34 | 40 | ||
| 35 | u64 initial_delay; ///< The delay until the timer fires for the first time | 41 | u64 initial_delay; ///< The delay until the timer fires for the first time |
| 36 | u64 interval_delay; ///< The delay until the timer fires after the first time | 42 | u64 interval_delay; ///< The delay until the timer fires after the first time |
| 37 | 43 | ||
| 38 | bool ShouldWait() override; | 44 | bool ShouldWait() override; |
| 39 | void Acquire() override; | 45 | void Acquire() override; |