summaryrefslogtreecommitdiffstats
path: root/src/core/hle/kernel/k_client_port.cpp
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2021-06-07 07:52:07 +0200
committerGitHub <noreply@github.com>2021-06-07 07:52:07 +0200
commit28eb8c83d479403b5da88ae7d3d2a1c6b81a6552 (patch)
tree43b28bb3b8df05e3f19fe4a151571dedd7171255 /src/core/hle/kernel/k_client_port.cpp
parentMerge pull request #6400 from ameerj/disable-uniform-simplify (diff)
parenthle: kernel: KServerSession: Use ASSERT_MSG where appropriate. (diff)
downloadyuzu-28eb8c83d479403b5da88ae7d3d2a1c6b81a6552.tar
yuzu-28eb8c83d479403b5da88ae7d3d2a1c6b81a6552.tar.gz
yuzu-28eb8c83d479403b5da88ae7d3d2a1c6b81a6552.tar.bz2
yuzu-28eb8c83d479403b5da88ae7d3d2a1c6b81a6552.tar.lz
yuzu-28eb8c83d479403b5da88ae7d3d2a1c6b81a6552.tar.xz
yuzu-28eb8c83d479403b5da88ae7d3d2a1c6b81a6552.tar.zst
yuzu-28eb8c83d479403b5da88ae7d3d2a1c6b81a6552.zip
Diffstat (limited to 'src/core/hle/kernel/k_client_port.cpp')
-rw-r--r--src/core/hle/kernel/k_client_port.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/core/hle/kernel/k_client_port.cpp b/src/core/hle/kernel/k_client_port.cpp
index 23d830d1f..50606bd91 100644
--- a/src/core/hle/kernel/k_client_port.cpp
+++ b/src/core/hle/kernel/k_client_port.cpp
@@ -16,11 +16,11 @@ namespace Kernel {
KClientPort::KClientPort(KernelCore& kernel_) : KSynchronizationObject{kernel_} {}
KClientPort::~KClientPort() = default;
-void KClientPort::Initialize(KPort* parent_, s32 max_sessions_, std::string&& name_) {
+void KClientPort::Initialize(KPort* parent_port_, s32 max_sessions_, std::string&& name_) {
// Set member variables.
num_sessions = 0;
peak_sessions = 0;
- parent = parent_;
+ parent = parent_port_;
max_sessions = max_sessions_;
name = std::move(name_);
}
@@ -56,7 +56,8 @@ bool KClientPort::IsSignaled() const {
return num_sessions < max_sessions;
}
-ResultCode KClientPort::CreateSession(KClientSession** out) {
+ResultCode KClientPort::CreateSession(KClientSession** out,
+ std::shared_ptr<SessionRequestManager> session_manager) {
// Reserve a new session from the resource limit.
KScopedResourceReservation session_reservation(kernel.CurrentProcess()->GetResourceLimit(),
LimitableResource::Sessions);
@@ -101,7 +102,7 @@ ResultCode KClientPort::CreateSession(KClientSession** out) {
}
// Initialize the session.
- session->Initialize(this, parent->GetName());
+ session->Initialize(this, parent->GetName(), session_manager);
// Commit the session reservation.
session_reservation.Commit();