diff options
author | Mat M <mathew1800@gmail.com> | 2019-01-04 15:18:41 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-04 15:18:41 +0100 |
commit | c5262b1890dc183532fe2058ca5b868d0a616824 (patch) | |
tree | 933257f9b1a9d8122772b4e7bc2c5535e1e5dd8b | |
parent | Merge pull request #1975 from lioncash/vi (diff) | |
parent | Removed pulse event type (diff) | |
download | yuzu-c5262b1890dc183532fe2058ca5b868d0a616824.tar yuzu-c5262b1890dc183532fe2058ca5b868d0a616824.tar.gz yuzu-c5262b1890dc183532fe2058ca5b868d0a616824.tar.bz2 yuzu-c5262b1890dc183532fe2058ca5b868d0a616824.tar.lz yuzu-c5262b1890dc183532fe2058ca5b868d0a616824.tar.xz yuzu-c5262b1890dc183532fe2058ca5b868d0a616824.tar.zst yuzu-c5262b1890dc183532fe2058ca5b868d0a616824.zip |
-rw-r--r-- | src/core/hle/kernel/object.h | 1 | ||||
-rw-r--r-- | src/core/hle/kernel/readable_event.cpp | 3 | ||||
-rw-r--r-- | src/core/hle/kernel/timer.cpp | 3 | ||||
-rw-r--r-- | src/yuzu/debugger/wait_tree.cpp | 2 |
4 files changed, 0 insertions, 9 deletions
diff --git a/src/core/hle/kernel/object.h b/src/core/hle/kernel/object.h index f1606a204..1541b6e3c 100644 --- a/src/core/hle/kernel/object.h +++ b/src/core/hle/kernel/object.h @@ -36,7 +36,6 @@ enum class HandleType : u32 { enum class ResetType { OneShot, ///< Reset automatically on object acquisition Sticky, ///< Never reset automatically - Pulse, ///< Reset automatically on wakeup }; class Object : NonCopyable { diff --git a/src/core/hle/kernel/readable_event.cpp b/src/core/hle/kernel/readable_event.cpp index ba01f495c..6973e580c 100644 --- a/src/core/hle/kernel/readable_event.cpp +++ b/src/core/hle/kernel/readable_event.cpp @@ -46,9 +46,6 @@ ResultCode ReadableEvent::Reset() { void ReadableEvent::WakeupAllWaitingThreads() { WaitObject::WakeupAllWaitingThreads(); - - if (reset_type == ResetType::Pulse) - signaled = false; } } // namespace Kernel diff --git a/src/core/hle/kernel/timer.cpp b/src/core/hle/kernel/timer.cpp index 6957b16e0..2c4f50e2b 100644 --- a/src/core/hle/kernel/timer.cpp +++ b/src/core/hle/kernel/timer.cpp @@ -68,9 +68,6 @@ void Timer::Clear() { void Timer::WakeupAllWaitingThreads() { WaitObject::WakeupAllWaitingThreads(); - - if (reset_type == ResetType::Pulse) - signaled = false; } void Timer::Signal(int cycles_late) { diff --git a/src/yuzu/debugger/wait_tree.cpp b/src/yuzu/debugger/wait_tree.cpp index df6eeb9a6..0c0864742 100644 --- a/src/yuzu/debugger/wait_tree.cpp +++ b/src/yuzu/debugger/wait_tree.cpp @@ -182,8 +182,6 @@ QString WaitTreeWaitObject::GetResetTypeQString(Kernel::ResetType reset_type) { return tr("one shot"); case Kernel::ResetType::Sticky: return tr("sticky"); - case Kernel::ResetType::Pulse: - return tr("pulse"); } UNREACHABLE(); return {}; |