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/lm/lm.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/lm/lm.cpp')
-rw-r--r-- | src/core/hle/service/lm/lm.cpp | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/src/core/hle/service/lm/lm.cpp b/src/core/hle/service/lm/lm.cpp index 13c9ee3d3..b505cdcaf 100644 --- a/src/core/hle/service/lm/lm.cpp +++ b/src/core/hle/service/lm/lm.cpp @@ -146,18 +146,19 @@ void InstallInterfaces(SM::ServiceManager& service_manager) { * 0: ResultCode */ void LM::Initialize(Kernel::HLERequestContext& ctx) { - auto client_port = std::make_shared<Logger>()->CreatePort(); - auto session = client_port->Connect(); - if (session.Succeeded()) { - LOG_DEBUG(Service_SM, "called, initialized logger -> session=%u", - (*session)->GetObjectId()); - IPC::RequestBuilder rb{ctx, 2, 0, 1}; - rb.Push(RESULT_SUCCESS); - rb.PushMoveObjects(std::move(session).Unwrap()); - registered_loggers.emplace_back(std::move(client_port)); - } else { - UNIMPLEMENTED(); - } + // TODO(Subv): Verify if this should return the interface as a domain object when called from + // within a domain. + + auto logger = std::make_shared<Logger>(); + auto sessions = Kernel::ServerSession::CreateSessionPair(logger->GetServiceName()); + auto server = std::get<Kernel::SharedPtr<Kernel::ServerSession>>(sessions); + auto client = std::get<Kernel::SharedPtr<Kernel::ClientSession>>(sessions); + logger->ClientConnected(server); + + LOG_DEBUG(Service_SM, "called, initialized logger -> session=%u", client->GetObjectId()); + IPC::RequestBuilder rb{ctx, 2, 0, 1}; + rb.Push(RESULT_SUCCESS); + rb.PushMoveObjects(std::move(client)); LOG_INFO(Service_SM, "called"); } |