summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar David Marcec2019-01-04 20:47:20 +1100
committerGravatar David Marcec2019-01-04 20:47:20 +1100
commit4f41fd84ffb09e648e3c5893a5cdc4e528480f98 (patch)
tree933257f9b1a9d8122772b4e7bc2c5535e1e5dd8b /src
parentMerge pull request #1975 from lioncash/vi (diff)
downloadyuzu-4f41fd84ffb09e648e3c5893a5cdc4e528480f98.tar.gz
yuzu-4f41fd84ffb09e648e3c5893a5cdc4e528480f98.tar.xz
yuzu-4f41fd84ffb09e648e3c5893a5cdc4e528480f98.zip
Removed pulse event type
Pulse is considered a hack and nothing should be using it. We should completely remove it
Diffstat (limited to 'src')
-rw-r--r--src/core/hle/kernel/object.h1
-rw-r--r--src/core/hle/kernel/readable_event.cpp3
-rw-r--r--src/core/hle/kernel/timer.cpp3
-rw-r--r--src/yuzu/debugger/wait_tree.cpp2
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 {
36enum class ResetType { 36enum class ResetType {
37 OneShot, ///< Reset automatically on object acquisition 37 OneShot, ///< Reset automatically on object acquisition
38 Sticky, ///< Never reset automatically 38 Sticky, ///< Never reset automatically
39 Pulse, ///< Reset automatically on wakeup
40}; 39};
41 40
42class Object : NonCopyable { 41class 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() {
46 46
47void ReadableEvent::WakeupAllWaitingThreads() { 47void ReadableEvent::WakeupAllWaitingThreads() {
48 WaitObject::WakeupAllWaitingThreads(); 48 WaitObject::WakeupAllWaitingThreads();
49
50 if (reset_type == ResetType::Pulse)
51 signaled = false;
52} 49}
53 50
54} // namespace Kernel 51} // 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() {
68 68
69void Timer::WakeupAllWaitingThreads() { 69void Timer::WakeupAllWaitingThreads() {
70 WaitObject::WakeupAllWaitingThreads(); 70 WaitObject::WakeupAllWaitingThreads();
71
72 if (reset_type == ResetType::Pulse)
73 signaled = false;
74} 71}
75 72
76void Timer::Signal(int cycles_late) { 73void 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) {
182 return tr("one shot"); 182 return tr("one shot");
183 case Kernel::ResetType::Sticky: 183 case Kernel::ResetType::Sticky:
184 return tr("sticky"); 184 return tr("sticky");
185 case Kernel::ResetType::Pulse:
186 return tr("pulse");
187 } 185 }
188 UNREACHABLE(); 186 UNREACHABLE();
189 return {}; 187 return {};