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; }; diff --git a/src/yuzu/debugger/wait_tree.cpp b/src/yuzu/debugger/wait_tree.cpp index 2b45b8573..f5a5697a0 100644 --- a/src/yuzu/debugger/wait_tree.cpp +++ b/src/yuzu/debugger/wait_tree.cpp @@ -328,11 +328,11 @@ std::vector> WaitTreeTimer::GetChildren() const { const auto& timer = static_cast(object); list.push_back(std::make_unique( - tr("reset type = %1").arg(GetResetTypeQString(timer.reset_type)))); + tr("reset type = %1").arg(GetResetTypeQString(timer.GetResetType())))); list.push_back( - std::make_unique(tr("initial delay = %1").arg(timer.initial_delay))); + std::make_unique(tr("initial delay = %1").arg(timer.GetInitialDelay()))); list.push_back( - std::make_unique(tr("interval delay = %1").arg(timer.interval_delay))); + std::make_unique(tr("interval delay = %1").arg(timer.GetIntervalDelay()))); return list; }