Browse Source
Merge pull request #1984 from ogniK5377/remove-pulse
Removed pulse event type
pull/15/merge
Mat M
7 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with
0 additions and
9 deletions
-
src/core/hle/kernel/object.h
-
src/core/hle/kernel/readable_event.cpp
-
src/core/hle/kernel/timer.cpp
-
src/yuzu/debugger/wait_tree.cpp
|
|
|
@ -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 { |
|
|
|
|
|
|
|
@ -46,9 +46,6 @@ ResultCode ReadableEvent::Reset() { |
|
|
|
|
|
|
|
void ReadableEvent::WakeupAllWaitingThreads() { |
|
|
|
WaitObject::WakeupAllWaitingThreads(); |
|
|
|
|
|
|
|
if (reset_type == ResetType::Pulse) |
|
|
|
signaled = false; |
|
|
|
} |
|
|
|
|
|
|
|
} // namespace Kernel
|
|
|
|
@ -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) { |
|
|
|
|
|
|
|
@ -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 {}; |
|
|
|
|