summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2018-07-26 15:45:18 +0200
committerLioncash <mathew1800@gmail.com>2018-07-26 15:51:44 +0200
commit0cd843151fdf1985889758c9310b3bfd22036100 (patch)
tree07ba1d07f5e0255e504a57d8c1b21ba5ff871927
parentMerge pull request #828 from lioncash/ldr (diff)
downloadyuzu-0cd843151fdf1985889758c9310b3bfd22036100.tar
yuzu-0cd843151fdf1985889758c9310b3bfd22036100.tar.gz
yuzu-0cd843151fdf1985889758c9310b3bfd22036100.tar.bz2
yuzu-0cd843151fdf1985889758c9310b3bfd22036100.tar.lz
yuzu-0cd843151fdf1985889758c9310b3bfd22036100.tar.xz
yuzu-0cd843151fdf1985889758c9310b3bfd22036100.tar.zst
yuzu-0cd843151fdf1985889758c9310b3bfd22036100.zip
Diffstat (limited to '')
-rw-r--r--src/core/hle/kernel/timer.h22
-rw-r--r--src/yuzu/debugger/wait_tree.cpp6
2 files changed, 20 insertions, 8 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;
};
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<std::unique_ptr<WaitTreeItem>> WaitTreeTimer::GetChildren() const {
const auto& timer = static_cast<const Kernel::Timer&>(object);
list.push_back(std::make_unique<WaitTreeText>(
- tr("reset type = %1").arg(GetResetTypeQString(timer.reset_type))));
+ tr("reset type = %1").arg(GetResetTypeQString(timer.GetResetType()))));
list.push_back(
- std::make_unique<WaitTreeText>(tr("initial delay = %1").arg(timer.initial_delay)));
+ std::make_unique<WaitTreeText>(tr("initial delay = %1").arg(timer.GetInitialDelay())));
list.push_back(
- std::make_unique<WaitTreeText>(tr("interval delay = %1").arg(timer.interval_delay)));
+ std::make_unique<WaitTreeText>(tr("interval delay = %1").arg(timer.GetIntervalDelay())));
return list;
}