diff options
author | bunnei <bunneidev@gmail.com> | 2018-01-23 03:37:15 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-23 03:37:15 +0100 |
commit | d1b64cdc070c02b63398803136c04d4fe8bd0df0 (patch) | |
tree | e41a908d37931f4a0de99f5fbe13cbb1f8a6f32c /src/core/hle/service/hid/hid.cpp | |
parent | Merge pull request #133 from Subv/nvflinger2 (diff) | |
parent | Services: Added a todo about returning interfaces as domain objects in lm, hid and time. (diff) | |
download | yuzu-d1b64cdc070c02b63398803136c04d4fe8bd0df0.tar yuzu-d1b64cdc070c02b63398803136c04d4fe8bd0df0.tar.gz yuzu-d1b64cdc070c02b63398803136c04d4fe8bd0df0.tar.bz2 yuzu-d1b64cdc070c02b63398803136c04d4fe8bd0df0.tar.lz yuzu-d1b64cdc070c02b63398803136c04d4fe8bd0df0.tar.xz yuzu-d1b64cdc070c02b63398803136c04d4fe8bd0df0.tar.zst yuzu-d1b64cdc070c02b63398803136c04d4fe8bd0df0.zip |
Diffstat (limited to 'src/core/hle/service/hid/hid.cpp')
-rw-r--r-- | src/core/hle/service/hid/hid.cpp | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cpp index d99e9c505..ae60cc7b4 100644 --- a/src/core/hle/service/hid/hid.cpp +++ b/src/core/hle/service/hid/hid.cpp @@ -162,23 +162,26 @@ public: ~Hid() = default; private: - Kernel::SharedPtr<Kernel::ClientPort> client_port; + std::shared_ptr<IAppletResource> applet_resource; void CreateAppletResource(Kernel::HLERequestContext& ctx) { - if (client_port == nullptr) { - client_port = std::make_shared<IAppletResource>()->CreatePort(); + if (applet_resource == nullptr) { + applet_resource = std::make_shared<IAppletResource>(); } - auto session = client_port->Connect(); - if (session.Succeeded()) { - LOG_DEBUG(Service, "called, initialized IAppletResource -> session=%u", - (*session)->GetObjectId()); - IPC::RequestBuilder rb{ctx, 2, 0, 1}; - rb.Push(RESULT_SUCCESS); - rb.PushMoveObjects(std::move(session).Unwrap()); - } else { - UNIMPLEMENTED(); - } + // TODO(Subv): Verify if this should return the interface as a domain object when called + // from within a domain. + + auto sessions = Kernel::ServerSession::CreateSessionPair(applet_resource->GetServiceName()); + auto server = std::get<Kernel::SharedPtr<Kernel::ServerSession>>(sessions); + auto client = std::get<Kernel::SharedPtr<Kernel::ClientSession>>(sessions); + applet_resource->ClientConnected(server); + + LOG_DEBUG(Service, "called, initialized IAppletResource -> session=%u", + client->GetObjectId()); + IPC::RequestBuilder rb{ctx, 2, 0, 1}; + rb.Push(RESULT_SUCCESS); + rb.PushMoveObjects(std::move(client)); } }; |