core: Port all current usages of Event to Readable/WritableEvent

This commit is contained in:
Zach Hilman
2018-11-26 18:34:07 -05:00
parent a56fc84e7a
commit ff610103b5
29 changed files with 287 additions and 164 deletions

View File

@ -4,7 +4,9 @@
#include "core/core.h"
#include "core/hle/ipc_helpers.h"
#include "core/hle/kernel/event.h"
#include "core/hle/kernel/kernel.h"
#include "core/hle/kernel/readable_event.h"
#include "core/hle/kernel/writable_event.h"
#include "core/hle/service/nifm/nifm.h"
#include "core/hle/service/service.h"
@ -56,8 +58,10 @@ public:
RegisterHandlers(functions);
auto& kernel = Core::System::GetInstance().Kernel();
event1 = Kernel::Event::Create(kernel, Kernel::ResetType::OneShot, "IRequest:Event1");
event2 = Kernel::Event::Create(kernel, Kernel::ResetType::OneShot, "IRequest:Event2");
event1 = Kernel::WritableEvent::CreateRegisteredEventPair(
kernel, Kernel::ResetType::OneShot, "IRequest:Event1");
event2 = Kernel::WritableEvent::CreateRegisteredEventPair(
kernel, Kernel::ResetType::OneShot, "IRequest:Event2");
}
private:
@ -88,7 +92,11 @@ private:
IPC::ResponseBuilder rb{ctx, 2, 2};
rb.Push(RESULT_SUCCESS);
rb.PushCopyObjects(event1, event2);
const auto& event1{Core::System::GetInstance().Kernel().FindNamedEvent("IRequest:Event1")};
const auto& event2{Core::System::GetInstance().Kernel().FindNamedEvent("IRequest:Event2")};
rb.PushCopyObjects(event1->second, event2->second);
}
void Cancel(Kernel::HLERequestContext& ctx) {
@ -105,7 +113,7 @@ private:
rb.Push(RESULT_SUCCESS);
}
Kernel::SharedPtr<Kernel::Event> event1, event2;
Kernel::SharedPtr<Kernel::WritableEvent> event1, event2;
};
class INetworkProfile final : public ServiceFramework<INetworkProfile> {