Port "kernel/event: Make data members private" from yuzu (#4077)
* kernel/event: Make data members private Instead we can simply provide accessors to the required data instead of giving external read/write access to the variables directly. * fix compile error
This commit is contained in:
parent
75927ee462
commit
642f0bd62b
5 changed files with 19 additions and 11 deletions
|
@ -25,16 +25,18 @@ public:
|
|||
std::string GetName() const override {
|
||||
return name;
|
||||
}
|
||||
void SetName(const std::string& name) {
|
||||
this->name = name;
|
||||
}
|
||||
|
||||
static const HandleType HANDLE_TYPE = HandleType::Event;
|
||||
HandleType GetHandleType() const override {
|
||||
return HANDLE_TYPE;
|
||||
}
|
||||
|
||||
ResetType reset_type; ///< Current ResetType
|
||||
|
||||
bool signaled; ///< Whether the event has already been signaled
|
||||
std::string name; ///< Name of event (optional)
|
||||
ResetType GetResetType() const {
|
||||
return reset_type;
|
||||
}
|
||||
|
||||
bool ShouldWait(Thread* thread) const override;
|
||||
void Acquire(Thread* thread) override;
|
||||
|
@ -47,6 +49,11 @@ public:
|
|||
private:
|
||||
Event();
|
||||
~Event() override;
|
||||
|
||||
ResetType reset_type; ///< Current ResetType
|
||||
|
||||
bool signaled; ///< Whether the event has already been signaled
|
||||
std::string name; ///< Name of event (optional)
|
||||
};
|
||||
|
||||
} // namespace Kernel
|
||||
|
|
|
@ -938,8 +938,9 @@ static ResultCode QueryMemory(MemoryInfo* memory_info, PageInfo* page_info, u32
|
|||
|
||||
/// Create an event
|
||||
static ResultCode CreateEvent(Handle* out_handle, u32 reset_type) {
|
||||
SharedPtr<Event> evt = Event::Create(static_cast<ResetType>(reset_type));
|
||||
evt->name = Common::StringFromFormat("event-%08x", Core::CPU().GetReg(14));
|
||||
SharedPtr<Event> evt =
|
||||
Event::Create(static_cast<ResetType>(reset_type),
|
||||
Common::StringFromFormat("event-%08x", Core::CPU().GetReg(14)));
|
||||
CASCADE_RESULT(*out_handle, g_handle_table.Create(std::move(evt)));
|
||||
|
||||
LOG_TRACE(Kernel_SVC, "called reset_type=0x{:08X} : created handle=0x{:08X}", reset_type,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue