mirror of
				https://git.suyu.dev/suyu/suyu
				synced 2025-10-30 15:39:02 -05:00 
			
		
		
		
	kernel: events: Remove ResetType::Automatic.
- This does not actually seem to exist in the real kernel - games reset these automatically. # Conflicts: # src/core/hle/service/am/applets/applets.cpp # src/core/hle/service/filesystem/fsp_srv.cpp
This commit is contained in:
		| @@ -58,8 +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, ResetType::Automatic, | ||||
|                                                          "HLE Pause Event: " + reason); | ||||
|         const auto pair = WritableEvent::CreateEventPair(kernel, "HLE Pause Event: " + reason); | ||||
|         writable_event = pair.writable; | ||||
|     } | ||||
|  | ||||
|   | ||||
| @@ -32,11 +32,6 @@ enum class HandleType : u32 { | ||||
|     ServerSession, | ||||
| }; | ||||
|  | ||||
| enum class ResetType { | ||||
|     Automatic, ///< Reset automatically on object acquisition | ||||
|     Manual,    ///< Never reset automatically | ||||
| }; | ||||
|  | ||||
| class Object : NonCopyable { | ||||
| public: | ||||
|     explicit Object(KernelCore& kernel); | ||||
|   | ||||
| @@ -20,10 +20,6 @@ bool ReadableEvent::ShouldWait(const Thread* thread) const { | ||||
|  | ||||
| void ReadableEvent::Acquire(Thread* thread) { | ||||
|     ASSERT_MSG(!ShouldWait(thread), "object unavailable!"); | ||||
|  | ||||
|     if (reset_type == ResetType::Automatic) { | ||||
|         signaled = false; | ||||
|     } | ||||
| } | ||||
|  | ||||
| void ReadableEvent::Signal() { | ||||
|   | ||||
| @@ -27,10 +27,6 @@ public: | ||||
|         return name; | ||||
|     } | ||||
|  | ||||
|     ResetType GetResetType() const { | ||||
|         return reset_type; | ||||
|     } | ||||
|  | ||||
|     static constexpr HandleType HANDLE_TYPE = HandleType::ReadableEvent; | ||||
|     HandleType GetHandleType() const override { | ||||
|         return HANDLE_TYPE; | ||||
| @@ -55,7 +51,6 @@ private: | ||||
|  | ||||
|     void Signal(); | ||||
|  | ||||
|     ResetType reset_type; | ||||
|     bool signaled{}; | ||||
|  | ||||
|     std::string name; ///< Name of event (optional) | ||||
|   | ||||
| @@ -2099,7 +2099,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::Manual, "CreateEvent"); | ||||
|         WritableEvent::CreateEventPair(kernel, "CreateEvent"); | ||||
|  | ||||
|     HandleTable& handle_table = kernel.CurrentProcess()->GetHandleTable(); | ||||
|  | ||||
|   | ||||
| @@ -15,8 +15,7 @@ namespace Kernel { | ||||
| WritableEvent::WritableEvent(KernelCore& kernel) : Object{kernel} {} | ||||
| WritableEvent::~WritableEvent() = default; | ||||
|  | ||||
| EventPair WritableEvent::CreateEventPair(KernelCore& kernel, ResetType reset_type, | ||||
|                                          std::string name) { | ||||
| EventPair WritableEvent::CreateEventPair(KernelCore& kernel, std::string name) { | ||||
|     SharedPtr<WritableEvent> writable_event(new WritableEvent(kernel)); | ||||
|     SharedPtr<ReadableEvent> readable_event(new ReadableEvent(kernel)); | ||||
|  | ||||
| @@ -24,7 +23,6 @@ EventPair WritableEvent::CreateEventPair(KernelCore& kernel, ResetType reset_typ | ||||
|     writable_event->readable = readable_event; | ||||
|     readable_event->name = name + ":Readable"; | ||||
|     readable_event->signaled = false; | ||||
|     readable_event->reset_type = reset_type; | ||||
|  | ||||
|     return {std::move(readable_event), std::move(writable_event)}; | ||||
| } | ||||
| @@ -33,10 +31,6 @@ SharedPtr<ReadableEvent> WritableEvent::GetReadableEvent() const { | ||||
|     return readable; | ||||
| } | ||||
|  | ||||
| ResetType WritableEvent::GetResetType() const { | ||||
|     return readable->reset_type; | ||||
| } | ||||
|  | ||||
| void WritableEvent::Signal() { | ||||
|     readable->Signal(); | ||||
| } | ||||
|   | ||||
| @@ -24,11 +24,9 @@ public: | ||||
|     /** | ||||
|      * Creates an event | ||||
|      * @param kernel The kernel instance to create this event under. | ||||
|      * @param reset_type ResetType describing how to create event | ||||
|      * @param name Optional name of event | ||||
|      */ | ||||
|     static EventPair CreateEventPair(KernelCore& kernel, ResetType reset_type, | ||||
|                                      std::string name = "Unknown"); | ||||
|     static EventPair CreateEventPair(KernelCore& kernel, std::string name = "Unknown"); | ||||
|  | ||||
|     std::string GetTypeName() const override { | ||||
|         return "WritableEvent"; | ||||
| @@ -44,8 +42,6 @@ public: | ||||
|  | ||||
|     SharedPtr<ReadableEvent> GetReadableEvent() const; | ||||
|  | ||||
|     ResetType GetResetType() const; | ||||
|  | ||||
|     void Signal(); | ||||
|     void Clear(); | ||||
|     bool IsSignaled() const; | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 bunnei
					bunnei