INSANEMODE/yuzu-android
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu-android.git synced 2025-06-11 04:17:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

hle: kernel: Migrate KEvent to KAutoObject.

Browse Source
This commit is contained in:
bunnei
2021-04-04 00:56:09 -07:00
parent 086db71e94
commit addc0bf037
37 changed files with 269 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/core/hle/service/nifm/nifm.cpp
View File

@ -127,7 +127,8 @@ public:
class IRequest final : public ServiceFramework<IRequest> {
public:
explicit IRequest(Core::System& system_) : ServiceFramework{system_, "IRequest"} {
explicit IRequest(Core::System& system_)
: ServiceFramework{system_, "IRequest"}, event1{system.Kernel()}, event2{system.Kernel()} {
static const FunctionInfo functions[] = {
{0, &IRequest::GetRequestState, "GetRequestState"},
{1, &IRequest::GetResult, "GetResult"},
@ -159,10 +160,8 @@ public:
auto& kernel = system.Kernel();
event1 = Kernel::KEvent::Create(kernel, "IRequest:Event1");
event1->Initialize();
event2 = Kernel::KEvent::Create(kernel, "IRequest:Event2");
event2->Initialize();
event1.Initialize("IRequest:Event1");
event2.Initialize("IRequest:Event2");
}
private:
@ -198,7 +197,7 @@ private:
IPC::ResponseBuilder rb{ctx, 2, 2};
rb.Push(RESULT_SUCCESS);
rb.PushCopyObjects(event1->GetReadableEvent(), event2->GetReadableEvent());
rb.PushCopyObjects(event1.GetReadableEvent(), event2.GetReadableEvent());
}
void Cancel(Kernel::HLERequestContext& ctx) {
@ -229,7 +228,7 @@ private:
rb.Push<u32>(0);
}
std::shared_ptr<Kernel::KEvent> event1, event2;
Kernel::KEvent event1, event2;
};
class INetworkProfile final : public ServiceFramework<INetworkProfile> {