mirror of
				https://git.zaroz.cloud/nintendo-back-up/yuzu/yuzu-mainline.git
				synced 2025-03-21 01:53:15 +00:00 
			
		
		
		
	Merge pull request #1984 from ogniK5377/remove-pulse
Removed pulse event type
This commit is contained in:
		
						commit
						c5262b1890
					
				@ -36,7 +36,6 @@ enum class HandleType : u32 {
 | 
				
			|||||||
enum class ResetType {
 | 
					enum class ResetType {
 | 
				
			||||||
    OneShot, ///< Reset automatically on object acquisition
 | 
					    OneShot, ///< Reset automatically on object acquisition
 | 
				
			||||||
    Sticky,  ///< Never reset automatically
 | 
					    Sticky,  ///< Never reset automatically
 | 
				
			||||||
    Pulse,   ///< Reset automatically on wakeup
 | 
					 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class Object : NonCopyable {
 | 
					class Object : NonCopyable {
 | 
				
			||||||
 | 
				
			|||||||
@ -46,9 +46,6 @@ ResultCode ReadableEvent::Reset() {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
void ReadableEvent::WakeupAllWaitingThreads() {
 | 
					void ReadableEvent::WakeupAllWaitingThreads() {
 | 
				
			||||||
    WaitObject::WakeupAllWaitingThreads();
 | 
					    WaitObject::WakeupAllWaitingThreads();
 | 
				
			||||||
 | 
					 | 
				
			||||||
    if (reset_type == ResetType::Pulse)
 | 
					 | 
				
			||||||
        signaled = false;
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
} // namespace Kernel
 | 
					} // namespace Kernel
 | 
				
			||||||
 | 
				
			|||||||
@ -68,9 +68,6 @@ void Timer::Clear() {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
void Timer::WakeupAllWaitingThreads() {
 | 
					void Timer::WakeupAllWaitingThreads() {
 | 
				
			||||||
    WaitObject::WakeupAllWaitingThreads();
 | 
					    WaitObject::WakeupAllWaitingThreads();
 | 
				
			||||||
 | 
					 | 
				
			||||||
    if (reset_type == ResetType::Pulse)
 | 
					 | 
				
			||||||
        signaled = false;
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void Timer::Signal(int cycles_late) {
 | 
					void Timer::Signal(int cycles_late) {
 | 
				
			||||||
 | 
				
			|||||||
@ -182,8 +182,6 @@ QString WaitTreeWaitObject::GetResetTypeQString(Kernel::ResetType reset_type) {
 | 
				
			|||||||
        return tr("one shot");
 | 
					        return tr("one shot");
 | 
				
			||||||
    case Kernel::ResetType::Sticky:
 | 
					    case Kernel::ResetType::Sticky:
 | 
				
			||||||
        return tr("sticky");
 | 
					        return tr("sticky");
 | 
				
			||||||
    case Kernel::ResetType::Pulse:
 | 
					 | 
				
			||||||
        return tr("pulse");
 | 
					 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
    UNREACHABLE();
 | 
					    UNREACHABLE();
 | 
				
			||||||
    return {};
 | 
					    return {};
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user