diff options
| author | 2021-04-13 17:48:37 -0700 | |
|---|---|---|
| committer | 2021-05-05 16:40:51 -0700 | |
| commit | 7444963bbb300cff269e410948de7fa577f5ff16 (patch) | |
| tree | 6e0000cb345dc02c8f2ca38958b7c90383f45b03 /src/core/hle/ipc_helpers.h | |
| parent | hle: kernel: svc: Migrate GetThreadContext, GetThreadCoreMask. (diff) | |
| download | yuzu-7444963bbb300cff269e410948de7fa577f5ff16.tar.gz yuzu-7444963bbb300cff269e410948de7fa577f5ff16.tar.xz yuzu-7444963bbb300cff269e410948de7fa577f5ff16.zip | |
hle: kernel: Migrate KSession, KClientSession, and KServerSession to KAutoObject.
Diffstat (limited to 'src/core/hle/ipc_helpers.h')
| -rw-r--r-- | src/core/hle/ipc_helpers.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/core/hle/ipc_helpers.h b/src/core/hle/ipc_helpers.h index 8f12616bd..99b7d3d82 100644 --- a/src/core/hle/ipc_helpers.h +++ b/src/core/hle/ipc_helpers.h | |||
| @@ -14,11 +14,9 @@ | |||
| 14 | #include "common/common_types.h" | 14 | #include "common/common_types.h" |
| 15 | #include "core/hle/ipc.h" | 15 | #include "core/hle/ipc.h" |
| 16 | #include "core/hle/kernel/client_port.h" | 16 | #include "core/hle/kernel/client_port.h" |
| 17 | #include "core/hle/kernel/client_session.h" | ||
| 18 | #include "core/hle/kernel/hle_ipc.h" | 17 | #include "core/hle/kernel/hle_ipc.h" |
| 18 | #include "core/hle/kernel/k_session.h" | ||
| 19 | #include "core/hle/kernel/object.h" | 19 | #include "core/hle/kernel/object.h" |
| 20 | #include "core/hle/kernel/server_session.h" | ||
| 21 | #include "core/hle/kernel/session.h" | ||
| 22 | #include "core/hle/result.h" | 20 | #include "core/hle/result.h" |
| 23 | 21 | ||
| 24 | namespace IPC { | 22 | namespace IPC { |
| @@ -137,9 +135,11 @@ public: | |||
| 137 | if (context->Session()->IsDomain()) { | 135 | if (context->Session()->IsDomain()) { |
| 138 | context->AddDomainObject(std::move(iface)); | 136 | context->AddDomainObject(std::move(iface)); |
| 139 | } else { | 137 | } else { |
| 140 | auto [client, server] = Kernel::Session::Create(kernel, iface->GetServiceName()); | 138 | auto* session = Kernel::KSession::Create(kernel); |
| 141 | context->AddMoveObject(client.get()); | 139 | session->Initialize(iface->GetServiceName()); |
| 142 | iface->ClientConnected(std::move(client), std::move(server)); | 140 | |
| 141 | context->AddMoveObject(&session->GetClientSession()); | ||
| 142 | iface->ClientConnected(session); | ||
| 143 | } | 143 | } |
| 144 | } | 144 | } |
| 145 | 145 | ||