From 626f746971d1d3216a38b20680959df3a1f5f256 Mon Sep 17 00:00:00 2001
From: bunnei <bunneidev@gmail.com>
Date: Fri, 23 Apr 2021 17:00:15 -0700
Subject: hle: kernel: Migrate KPort, KClientPort, and KServerPort to
 KAutoObject.

---
 src/core/hle/kernel/k_session.cpp | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

(limited to 'src/core/hle/kernel/k_session.cpp')

diff --git a/src/core/hle/kernel/k_session.cpp b/src/core/hle/kernel/k_session.cpp
index ca1cf18cd..6f4276189 100644
--- a/src/core/hle/kernel/k_session.cpp
+++ b/src/core/hle/kernel/k_session.cpp
@@ -1,8 +1,9 @@
-// Copyright 2019 yuzu emulator team
+// Copyright 2021 yuzu emulator team
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
 #include "common/assert.h"
+#include "core/hle/kernel/k_client_port.h"
 #include "core/hle/kernel/k_client_session.h"
 #include "core/hle/kernel/k_scoped_resource_reservation.h"
 #include "core/hle/kernel/k_server_session.h"
@@ -14,7 +15,7 @@ KSession::KSession(KernelCore& kernel)
     : KAutoObjectWithSlabHeapAndContainer{kernel}, server{kernel}, client{kernel} {}
 KSession::~KSession() = default;
 
-void KSession::Initialize(std::string&& name_) {
+void KSession::Initialize(KClientPort* port_, std::string&& name_) {
     // Increment reference count.
     // Because reference count is one on creation, this will result
     // in a reference count of two. Thus, when both server and client are closed
@@ -37,11 +38,22 @@ void KSession::Initialize(std::string&& name_) {
     process = kernel.CurrentProcess();
     process->Open();
 
+    // Set our port.
+    port = port_;
+    if (port != nullptr) {
+        port->Open();
+    }
+
     // Mark initialized.
     initialized = true;
 }
 
-void KSession::Finalize() {}
+void KSession::Finalize() {
+    if (port != nullptr) {
+        port->OnSessionFinalized();
+        port->Close();
+    }
+}
 
 void KSession::OnServerClosed() {
     if (GetState() == State::Normal) {
-- 
cgit v1.2.3