Merge pull request #2486 from lioncash/resetname
core/kernel/object: Rename ResetType enum members for clarity
This commit is contained in:
		@@ -58,7 +58,7 @@ SharedPtr<WritableEvent> HLERequestContext::SleepClientThread(
 | 
			
		||||
    auto& kernel = Core::System::GetInstance().Kernel();
 | 
			
		||||
    if (!writable_event) {
 | 
			
		||||
        // Create event if not provided
 | 
			
		||||
        const auto pair = WritableEvent::CreateEventPair(kernel, Kernel::ResetType::OneShot,
 | 
			
		||||
        const auto pair = WritableEvent::CreateEventPair(kernel, ResetType::Automatic,
 | 
			
		||||
                                                         "HLE Pause Event: " + reason);
 | 
			
		||||
        writable_event = pair.writable;
 | 
			
		||||
    }
 | 
			
		||||
 
 | 
			
		||||
@@ -33,8 +33,8 @@ enum class HandleType : u32 {
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
enum class ResetType {
 | 
			
		||||
    OneShot, ///< Reset automatically on object acquisition
 | 
			
		||||
    Sticky,  ///< Never reset automatically
 | 
			
		||||
    Automatic, ///< Reset automatically on object acquisition
 | 
			
		||||
    Manual,    ///< Never reset automatically
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
class Object : NonCopyable {
 | 
			
		||||
 
 | 
			
		||||
@@ -21,8 +21,9 @@ bool ReadableEvent::ShouldWait(const Thread* thread) const {
 | 
			
		||||
void ReadableEvent::Acquire(Thread* thread) {
 | 
			
		||||
    ASSERT_MSG(!ShouldWait(thread), "object unavailable!");
 | 
			
		||||
 | 
			
		||||
    if (reset_type == ResetType::OneShot)
 | 
			
		||||
    if (reset_type == ResetType::Automatic) {
 | 
			
		||||
        signaled = false;
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void ReadableEvent::Signal() {
 | 
			
		||||
 
 | 
			
		||||
@@ -1980,7 +1980,7 @@ static ResultCode CreateEvent(Core::System& system, Handle* write_handle, Handle
 | 
			
		||||
 | 
			
		||||
    auto& kernel = system.Kernel();
 | 
			
		||||
    const auto [readable_event, writable_event] =
 | 
			
		||||
        WritableEvent::CreateEventPair(kernel, ResetType::Sticky, "CreateEvent");
 | 
			
		||||
        WritableEvent::CreateEventPair(kernel, ResetType::Manual, "CreateEvent");
 | 
			
		||||
 | 
			
		||||
    HandleTable& handle_table = kernel.CurrentProcess()->GetHandleTable();
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user