CCF_100/citra
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Port "kernel/event: Make data members private" from yuzu (#4077)

Browse Source 
* 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:
zhaowenlan1779
2018-08-25 01:43:29 +08:00
committed by Tobias
parent 75927ee462
commit 642f0bd62b
5 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/hle/service/ac/ac.cpp
View File

@@ -37,7 +37,7 @@ void Module::Interface::ConnectAsync(Kernel::HLERequestContext& ctx) {
ac->connect_event = rp.PopObject<Kernel::Event>();
if (ac->connect_event) {
ac->connect_event->name = "AC:connect_event";
ac->connect_event->SetName("AC:connect_event");
ac->connect_event->Signal();
ac->ac_connected = true;
}
@@ -67,7 +67,7 @@ void Module::Interface::CloseAsync(Kernel::HLERequestContext& ctx) {
}
if (ac->close_event) {
ac->close_event->name = "AC:close_event";
ac->close_event->SetName("AC:close_event");
ac->close_event->Signal();
}
@@ -134,7 +134,7 @@ void Module::Interface::RegisterDisconnectEvent(Kernel::HLERequestContext& ctx)
ac->disconnect_event = rp.PopObject<Kernel::Event>();
if (ac->disconnect_event) {
ac->disconnect_event->name = "AC:disconnect_event";
ac->disconnect_event->SetName("AC:disconnect_event");
}
IPC::RequestBuilder rb = rp.MakeBuilder(1, 0);

2
src/core/hle/service/gsp/gsp_gpu.cpp
View File

@@ -354,7 +354,7 @@ void GSP_GPU::RegisterInterruptRelayQueue(Kernel::HLERequestContext& ctx) {
// TODO(mailwl): return right error code instead assert
ASSERT_MSG((interrupt_event != nullptr), "handle is not valid!");
interrupt_event->name = "GSP_GSP_GPU::interrupt_event";
interrupt_event->SetName("GSP_GSP_GPU::interrupt_event");
SessionData* session_data = GetSessionData(ctx.Session());
session_data->interrupt_event = std::move(interrupt_event);