diff options
author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-01-23 05:19:33 +0100 |
---|---|---|
committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-01-30 14:47:07 +0100 |
commit | ad80ff1e322430634e04ffcb39ffef268411ea6b (patch) | |
tree | d9f7c1db67286a11812ffcc1e26f1abb5c02a033 /src/core/hle/kernel/timer.h | |
parent | Kernel: Convert Mutex to not use Handles (diff) | |
download | yuzu-ad80ff1e322430634e04ffcb39ffef268411ea6b.tar yuzu-ad80ff1e322430634e04ffcb39ffef268411ea6b.tar.gz yuzu-ad80ff1e322430634e04ffcb39ffef268411ea6b.tar.bz2 yuzu-ad80ff1e322430634e04ffcb39ffef268411ea6b.tar.lz yuzu-ad80ff1e322430634e04ffcb39ffef268411ea6b.tar.xz yuzu-ad80ff1e322430634e04ffcb39ffef268411ea6b.tar.zst yuzu-ad80ff1e322430634e04ffcb39ffef268411ea6b.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/kernel/timer.h | 69 |
1 files changed, 41 insertions, 28 deletions
diff --git a/src/core/hle/kernel/timer.h b/src/core/hle/kernel/timer.h index 8170e82d4..24552b4b9 100644 --- a/src/core/hle/kernel/timer.h +++ b/src/core/hle/kernel/timer.h @@ -11,37 +11,50 @@ namespace Kernel { -/** - * Cancels a timer - * @param handle Handle of the timer to cancel - */ -ResultCode CancelTimer(Handle handle); - -/** - * Starts a timer with the specified initial delay and interval - * @param handle Handle of the timer to start - * @param initial Delay until the timer is first fired - * @param interval Delay until the timer is fired after the first time - */ -ResultCode SetTimer(Handle handle, s64 initial, s64 interval); - -/** - * Clears a timer - * @param handle Handle of the timer to clear - */ -ResultCode ClearTimer(Handle handle); - -/** - * Creates a timer - * @param handle Handle to the newly created Timer object - * @param reset_type ResetType describing how to create the timer - * @param name Optional name of timer - * @return ResultCode of the error - */ -ResultCode CreateTimer(Handle* handle, const ResetType reset_type, const std::string& name="Unknown"); +class Timer : public WaitObject { +public: + /** + * Creates a timer + * @param reset_type ResetType describing how to create the timer + * @param name Optional name of timer + * @return The created Timer + */ + static ResultVal<SharedPtr<Timer>> Create(ResetType reset_type, std::string name = "Unknown"); + + std::string GetTypeName() const override { return "Timer"; } + std::string GetName() const override { return name; } + + static const HandleType HANDLE_TYPE = HandleType::Timer; + HandleType GetHandleType() const override { return HANDLE_TYPE; } + + ResetType reset_type; ///< The ResetType of this timer + + bool signaled; ///< Whether the timer has been signaled or not + std::string name; ///< Name of timer (optional) + + 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 ShouldWait() override; + void Acquire() override; + + /** + * Starts the timer, with the specified initial delay and interval. + * @param initial Delay until the timer is first fired + * @param interval Delay until the timer is fired after the first time + */ + void Set(s64 initial, s64 interval); + + void Cancel(); + void Clear(); + +private: + Timer() = default; +}; /// Initializes the required variables for timers void TimersInit(); /// Tears down the timer variables void TimersShutdown(); + } // namespace |